summaryrefslogtreecommitdiff
path: root/devel/bzr
AgeCommit message (Collapse)AuthorFilesLines
2006-07-12Update to 0.8.2. Add test target. Add py-expat dependency.wiz3-115/+346
Generate and install man page. bzr 0.8.2 2006-05-17 BUG FIXES: * setup.py failed to install launchpad plugin. (Martin Pool) bzr 0.8.1 2006-05-16 BUG FIXES: * Fix failure to commit a merge in a checkout. (Martin Pool, Robert Collins, Erik Bågfors, #43959) * Nicer messages from 'commit' in the case of renames, and correct messages when a merge has occured. (Robert Collins, Martin Pool) * Separate functionality from assert statements as they are skipped in optimized mode of python. Add the same check to pending merges. (#44443, Olaf Conradi) CHANGES: * Do not show the None revision in output of bzr ancestry. (Olaf Conradi) * Add info on standalone branches without a working tree. (#44155, Olaf Conradi) * Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi) CHANGES: * Make editor invocation comply with Debian Policy. First check environment variables VISUAL and EDITOR, then try editor from alternatives system. If that all fails, fall back to the pre-defined list of editors. (#42904, Olaf Conradi) NEW FEATURES: * New 'register-branch' command registers a public branch into Launchpad.net, where it can be associated with bugs, etc. (Martin Pool, Bjorn Tillenius, Robert Collins) TESTING: * Fix test case for bzr info in upgrading a standalone branch to metadir, uses bzrlib api now. (Olaf Conradi) bzr 0.8 2006-05-08 NOTES WHEN UPGRADING: Release 0.8 of bzr introduces a new format for history storage, called 'knit', as an evolution of to the 'weave' format used in 0.7. Local and remote operations are faster using knits than weaves. Several operations including 'init', 'init-repo', and 'upgrade' take a --format option that controls this. Branching from an existing branch will keep the same format. It is possible to merge, pull and push between branches of different formats but this is slower than moving data between homogenous branches. It is therefore recommended (but not required) that you upgrade all branches for a project at the same time. Information on formats is shown by 'bzr info'. bzr 0.8 now allows creation of 'repositories', which hold the history of files and revisions for several branches. Previously bzr kept all the history for a branch within the .bzr directory at the root of the branch, and this is still the default. To create a repository, use the new 'bzr init-repo' command. Branches exist as directories under the repository and contain just a small amount of information indicating the current revision of the branch. bzr 0.8 also supports 'checkouts', which are similar to in cvs and subversion. Checkouts are associated with a branch (optionally in a repository), which contains all the historical information. The result is that a checkout can be deleted without losing any already-committed revisions. A new 'update' command is also available. Repositories and checkouts are not supported with the 0.7 storage format. To use them you must upgrad to either knits, or to the 'metaweave' format, which uses weaves but changes the .bzr directory arrangement. IMPROVEMENTS: * Sftp paths can now be relative, or local, according to the lftp convention. Paths now take the form: sftp://user:pass@host:port/~/relative/path or sftp://user:pass@host:port/absolute/path * The FTP transport now tries to reconnect after a temporary failure. ftp put is made atomic. (Matthieu Moy) * The FTP transport now maintains a pool of connections, and reuses them to avoid multiple connections to the same host (like sftp did). (Daniel Silverstone) * The bzr_man.py file has been removed. To create the man page now, use ./generate_docs.py man. The new program can also create other files. Run "python generate_docs.py --help" for usage information. (Hans Ulrich Niedermann & James Blackwell). * Man Page now gives full help (James Blackwell). Help also updated to reflect user config now being stored in .bazaar (Hans Ulrich Niedermann) * It's now possible to set aliases in bazaar.conf (Erik Bågfors) * Pull now accepts a --revision argument (Erik Bågfors) * 'bzr re-sign' now allows multiple revisions to be supplied on the command line. You can now use the following command to sign all of your old commits. find .bzr/revision-store// -name my@email-* \ | sed 's/.*\/\/..\///' \ | xargs bzr re-sign * Upgrade can now upgrade over the network. (Robert Collins) * Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike behaviour. By default they will cache history in the checkout, but with --lightweight almost all data is kept in the master branch. (Robert Collins) * 'revert' unversions newly-versioned files, instead of deleting them. * 'merge' is more robust. Conflict messages have changed. * 'merge' and 'revert' no longer clobber existing files that end in '~' or '.moved'. * Default log format can be set in configuration and plugins can register their own formatters. (Erik Bågfors) * New 'reconcile' command will check branch consistency and repair indexes that can become out of sync in pre 0.8 formats. (Robert Collins, Daniel Silverstone) * New 'bzr init --format' and 'bzr upgrade --format' option to control what storage format is created or produced. (Robert Collins, Martin Pool) * Add parent location to 'bzr info', if there is one. (Olaf Conradi) * New developer commands 'weave-list' and 'weave-join'. (Martin Pool) * New 'init-repository' command, plus support for repositories in 'init' and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins) * Improve output of 'info' command. Show all relevant locations related to working tree, branch and repository. Use kibibytes for binary quantities. Fix off-by-one error in missing revisions of working tree. Make 'info' work on branches, repositories and remote locations. Show locations relative to the shared repository, if applicable. Show locking status of locations. (Olaf Conradi) * Diff and merge now safely handle binary files. (Aaron Bentley) * 'pull' and 'push' now normalise the revision history, so that any two branches with the same tip revision will have the same output from 'log'. (Robert Collins) * 'merge' accepts --remember option to store parent location, like 'push' and 'pull'. (Olaf Conradi) * bzr status and diff when files given as arguments do not exist in the relevant trees. (Martin Pool, #3619) * Add '.hg' to the default ignore list. (Martin Pool) * 'knit' is now the default disk format. This improves disk performance and utilization, increases incremental pull performance, robustness with SFTP and allows checkouts over SFTP to perform acceptably. The initial Knit code was contributed by Johan Rydberg based on a specification by Martin Pool. (Robert Collins, Aaron Bentley, John Rydberg, Martin Pool). * New tool to generate all-in-one html version of the manual. (Alexander Belchenko) * Hitting CTRL-C while doing an SFTP push will no longer cause stale locks to be left in the SFTP repository. (Robert Collins, Martin Pool). * New option 'diff --prefix' to control how files are named in diff output, with shortcuts '-p0' and '-p1' corresponding to the options for GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool) * Add --revision option to 'annotate' command. (Olaf Conradi) * If bzr shows an unexpected revision-history after pulling (perhaps due to a reweave) it can now be corrected by 'bzr reconcile'. (Robert Collins) CHANGES: * Commit is now verbose by default, and shows changed filenames and the new revision number. (Robert Collins, Martin Pool) * Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller) * 'bzr -h' shows help. (#35940, Martin Pool, Ian Bicking) * Make 'pull' and 'push' remember location on failure using --remember. (Olaf Conradi) * For compatibility, make old format for using weaves inside metadir available as 'metaweave' format. Rename format 'metadir' to 'default'. Clean up help for option --format in commands 'init', 'init-repo' and 'upgrade'. (Olaf Conradi) TESTING: * SFTP tests now shortcut the SSH negotiation, reducing test overhead for testing SFTP protocol support. (Robey Pointer) * Branch formats are now tested once per implementation (see bzrlib. tests.branch_implementations. This is analagous to the transport interface tests, and has been followed up with working tree, repository and BzrDir tests. (Robert Collins) * New test base class TestCaseWithTransport provides a transport aware test environment, useful for testing any transport-interface using code. The test suite option --transport controls the transport used by this class (when its not being used as part of implementation contract testing). (Robert Collins) * Close logging handler on disabling the test log. This will remove the handler from the internal list inside python's logging module, preventing shutdown from closing it twice. (Olaf Conradi) * Move test case for uncommit to blackbox tests. (Olaf Conradi) * run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which will provide String("foo") to the command as its stdin.
2006-03-04Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where nojlam1-2/+2
developer is officially maintaining the package. The rationale for changing this from "tech-pkg" to "pkgsrc-users" is that it implies that any user can try to maintain the package (by submitting patches to the mailing list). Since the folks most likely to care about the package are the folks that want to use it or are already using it, this would leverage the energy of users who aren't developers.
2006-02-05Recursive revision bump / recommended bump for gettext ABI change.joerg1-1/+2
2006-01-25Update to 0.7:wiz3-176/+270
bzr 0.7 2006-01-23 CHANGES: * .bzrignore is excluded from exports, on the grounds that it's a bzr internal-use file and may not be wanted. (Jamie Wilkinson) * The "bzr directories" command were removed in favor of the new --kind option to the "bzr inventory" command. To list all versioned directories, now use "bzr inventory --kind directory". (Johan Rydberg) * Under Windows configuration directory is now %APPDATA%\bazaar\2.0 by default. (John Arbash Meinel) * The parent of Bzr configuration directory can be set by BZR_HOME environment variable. Now the path for it is searched in BZR_HOME, then in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually points to C:\Documents and Settings\User Name\Application Data), HOME. (John Arbash Meinel) * Plugins with the same name in different directories in the bzr plugin path are no longer loaded: only the first successfully loaded one is used. (Robert Collins) * Use systems' external ssh command to open connections if possible. This gives better integration with user settings such as ProxyCommand. (James Henstridge) * Sftp paths can now be relative, or local, according to the IETF draft spec. Paths now take the form: sftp://user:pass@host:port/relative/path or sftp://user:pass@host:port/%2Fabsolute/path or sftp://user:pass@host:port//absolute/path * Permissions on files underneath .bzr/ are inherited from the .bzr directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/' will mean that future file will be created with group write permissions. * configure.in and config.guess are no longer in the builtin default ignore list. * '.sw[nop]' pattern ignored, to ignore vim swap files for nameless files. (John Arbash Meinel, Martin Pool) IMPROVEMENTS: * "bzr INIT dir" now initializes the specified directory, and creates it if it does not exist. (John Arbash Meinel) * New remerge command (Aaron Bentley) * Better zsh completion script. (Steve Borho) * 'bzr diff' now returns 1 when there are changes in the working tree. (Robert Collins) * 'bzr push' now exists and can push changes to a remote location. This uses the transport infrastructure, and can store the remote location in the ~/.bazaar/branches.conf configuration file. (Robert Collins) * Test directories are only kept if the test fails and the user requests that they be kept. * Tweaks to short log printing * Added branch nicks, new nick command, printing them in log output. (Aaron Bentley) * If $BZR_PDB is set, pop into the debugger when an uncaught exception occurs. (Martin Pool) * Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is the same as Subversion. (Martin Pool) * New ftp transport support (on ftplib), for ftp:// and aftp:// URLs. (Daniel Silverstone) * Commit editor temporary files now start with 'bzr_log.', to allow text editors to match the file name and set up appropriate modes or settings. (Magnus Therning) * Improved performance when integrating changes from a remote weave. (Goffredo Baroncelli) * Sftp will attempt to cache the connection, so it is more likely that a connection will be reused, rather than requiring multiple password requests. * bzr revno now takes an optional argument indicating the branch whose revno should be printed. (Michael Ellerman) * bzr cat defaults to printing the last version of the file. (#3632, Matthieu Moy) * New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof profiler. (Denys Duchier) * Faster commits by reading only the headers of affected weave files. (Denys Duchier) * 'bzr add' now takes a --dry-run parameter which shows you what would be added, but doesn't actually add anything. (Michael Ellerman) * bzr add now lists how many files were ignored per glob. add --verbose lists the specific files. (Aaron Bentley) * Reduced CPU usage for merge/fetch. (Goffredo Baroncelli) * Faster diff and status commands. (Denys Duchier) BUG FIXES: * SFTP can walk up to the root path without index errors. (Robert Collins) * Fix bugs in running bzr with 'python -O'. (Martin Pool) * Error when run with -OO * Fix bug in reporting http errors that don't have an http error code. (Martin Pool) * Handle more cases of pipe errors in display commands * Change status to 3 for all errors * Files that are added and unlinked before committing are completely ignored by diff and status * Stores with some compressed texts and some uncompressed texts are now able to be used. (John A Meinel) * Fix for bzr pull failing sometimes under windows * Fix for sftp transport under windows when using interactive auth * Show files which are both renamed and modified as such in 'bzr status' output. (#4503, Daniel Silverstone) * Make annotate cope better with revisions committed without a valid email address. (Marien Zwart) * Fix representation of tab characters in commit messages. (Harald Meland) * List of plugin directories in BZR_PLUGIN_PATH environment variable is now parsed properly under Windows. (Alexander Belchenko) * Show number of revisions pushed/pulled/merged. (Robey Pointer) * Keep a cached copy of the basis inventory to speed up operations that need to refer to it. (Johan Rydberg, Martin Pool) * Fix bugs in bzr status display of non-ascii characters. (Martin Pool) * Remove Makefile.in from default ignore list. (#6413, Tollef Fog Heen, Martin Pool) * Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool) TESTING: * Fix selftest asking for passwords when there are no SFTP keys. (Robey Pointer, Jelmer Vernooij) * Fix selftest run with 'python -O'. (Martin Pool) * Fix HTTP tests under Windows. (John Arbash Meinel) * Make tests work even if HOME is not set (Aaron Bentley) * Updated build_tree to use fixed line-endings for tests which read the file cotents and compare. Make some tests use this to pass under Windows. (John Arbash Meinel) * Skip stat and symlink tests under Windows. (Alexander Belchenko) * Delay in selftest/testhashcash is now issued under win32 and Cygwin. (John Arbash Meinel) * Use terminal width to align verbose test output. (Martin Pool) * Blackbox tests are maintained within the bzrlib.tests.blackbox directory. If adding a new test script please add that to bzrlib.tests.blackbox.__init__. (Robert Collins) * Much better error message if one of the test suites can't be imported. (Martin Pool) * Make check now runs the test suite twice - once with the default locale, and once with all locales forced to C, to expose bugs. This is not trivially done within python, so for now its only triggered by running Make check. Integrators and packagers who wish to check for full platform support should run 'make check' to test the source. (Robert Collins) * Tests can now run TestSkipped if they can't execute for any reason. (Martin Pool) (NB: TestSkipped should only be raised for correctable reasons - see the wiki spec ImprovingBzrTestSuite). INTERNALS: (removed from pkgsrc commit message)
2006-01-15Initial import of bzr-0.6.2:wiz4-0/+521
bazaar-ng is a distributed/decentralized version control system. Features include: * simple to use * runs on Unix and Windows * branches can be hosted on an http server with no special software * full directory versioning including tracking subdirectories, file renames, symlinks and execute-bits * friendly interface that should be familiar to users of cvs, svn or other systems * Python interface for extending and embedding, including a plugin interface * strong integrity protection, including gpg-signing * vibrant and active community For usage instructions run "bzr help".