# HG changeset patch # User Matt Mackall # Date 1280264622 18000 # Node ID 708291e9389cb4c84c4f86935fd77fe9a717f5a6 # Parent ee8f36a6c766c2cfd3afb4b0e0074dd489d0214e# Parent b6360a113478bddee042bdec11328f1f71936970 Merge with crew diff -r ee8f36a6c766 -r 708291e9389c hgext/bookmarks.py --- a/hgext/bookmarks.py Tue Jul 27 14:43:40 2010 +0200 +++ b/hgext/bookmarks.py Tue Jul 27 16:03:42 2010 -0500 @@ -457,7 +457,7 @@ lmarks = repo.listkeys('bookmarks') rmarks = remote.listkeys('bookmarks') - diff = set(rmarks) - set(lmarks) + diff = sorted(set(rmarks) - set(lmarks)) for k in diff: ui.write(" %-25s %s\n" % (k, rmarks[k][:12])) diff -r ee8f36a6c766 -r 708291e9389c hgext/convert/__init__.py --- a/hgext/convert/__init__.py Tue Jul 27 14:43:40 2010 +0200 +++ b/hgext/convert/__init__.py Tue Jul 27 16:03:42 2010 -0500 @@ -86,7 +86,7 @@ rename path/to/source path/to/destination - Comment lines start with '#'. A specificed path matches if it + Comment lines start with '#'. A specified path matches if it equals the full relative name of a file or one of its parent directories. The 'include' or 'exclude' directive with the longest matching path applies, so line order does not matter. @@ -96,8 +96,8 @@ exclusion of all other files and directories not explicitly included. The 'exclude' directive causes files or directories to be omitted. The 'rename' directive renames a file or directory if - is converted. To rename from a subdirectory into the root of the - repository, use '.' as the path to rename to. + it is converted. To rename from a subdirectory into the root of + the repository, use '.' as the path to rename to. The splicemap is a file that allows insertion of synthetic history, letting you specify the parents of a revision. This is diff -r ee8f36a6c766 -r 708291e9389c mercurial/commands.py --- a/mercurial/commands.py Tue Jul 27 14:43:40 2010 +0200 +++ b/mercurial/commands.py Tue Jul 27 16:03:42 2010 -0500 @@ -890,7 +890,7 @@ # we don't want to fail in merges during buildup os.environ['HGMERGE'] = 'internal:local' - def writefile(fname, text, fmode="w"): + def writefile(fname, text, fmode="wb"): f = open(fname, fmode) try: f.write(text) @@ -925,7 +925,7 @@ merge(ui, repo, node=p2) if mergeable_file: - f = open("mf", "r+") + f = open("mf", "rb+") try: lines = f.read().split("\n") lines[id * linesperrev] += " r%i" % id @@ -935,7 +935,7 @@ f.close() if appended_file: - writefile("af", "r%i\n" % id, "a") + writefile("af", "r%i\n" % id, "ab") if overwritten_file: writefile("of", "r%i\n" % id) diff -r ee8f36a6c766 -r 708291e9389c mercurial/dispatch.py --- a/mercurial/dispatch.py Tue Jul 27 14:43:40 2010 +0200 +++ b/mercurial/dispatch.py Tue Jul 27 16:03:42 2010 -0500 @@ -24,7 +24,7 @@ except util.Abort, inst: sys.stderr.write(_("abort: %s\n") % inst) if inst.hint: - sys.stdout.write(_("(%s)\n") % inst.hint) + sys.stderr.write(_("(%s)\n") % inst.hint) return -1 except error.ParseError, inst: if len(inst.args) > 1: @@ -119,7 +119,7 @@ except util.Abort, inst: ui.warn(_("abort: %s\n") % inst) if inst.hint: - ui.status(_("(%s)\n") % inst.hint) + ui.warn(_("(%s)\n") % inst.hint) except ImportError, inst: ui.warn(_("abort: %s!\n") % inst) m = str(inst).split()[-1] diff -r ee8f36a6c766 -r 708291e9389c mercurial/help/glossary.txt --- a/mercurial/help/glossary.txt Tue Jul 27 14:43:40 2010 +0200 +++ b/mercurial/help/glossary.txt Tue Jul 27 16:03:42 2010 -0500 @@ -16,7 +16,7 @@ a remote repository, since new heads may be created by these operations. Note that the term branch can also be used informally to describe a development process in which certain development is - done independently of other development.This is sometimes done + done independently of other development. This is sometimes done explicitly with a named branch, but it can also be done locally, using bookmarks or clones and anonymous branches. diff -r ee8f36a6c766 -r 708291e9389c mercurial/help/revsets.txt --- a/mercurial/help/revsets.txt Tue Jul 27 14:43:40 2010 +0200 +++ b/mercurial/help/revsets.txt Tue Jul 27 16:03:42 2010 -0500 @@ -58,8 +58,7 @@ Alias for ``user(string)``. ``branch(set)`` - The branch names are found for changesets in set, and the result is - all changesets belonging to one those branches. + All changesets belonging to the branches of changesets in set. ``children(set)`` Child changesets of changesets in set. @@ -74,10 +73,10 @@ Changesets within the interval, see :hg:`help dates`. ``descendants(set)`` - Changesets which are decendants of changesets in set. + Changesets which are descendants of changesets in set. ``file(pattern)`` - Changesets which manually affected files matching pattern. + Changesets affecting files matched by pattern. ``follow()`` An alias for ``::.`` (ancestors of the working copy's first parent). @@ -105,10 +104,11 @@ Changeset is a merge changeset. ``modifies(pattern)`` - Changesets which modify files matching pattern. + Changesets modifying files matched by pattern. ``outgoing([path])`` - Changesets missing in path. + Changesets not found in the specified destination repository, or the + default push location. ``p1(set)`` First parent of changesets in set. diff -r ee8f36a6c766 -r 708291e9389c mercurial/transaction.py --- a/mercurial/transaction.py Tue Jul 27 14:43:40 2010 +0200 +++ b/mercurial/transaction.py Tue Jul 27 16:03:42 2010 -0500 @@ -115,7 +115,7 @@ def release(self): if self.count > 0: self.usages -= 1 - # of the transaction scopes are left without being closed, fail + # if the transaction scopes are left without being closed, fail if self.count > 0 and self.usages == 0: self._abort() diff -r ee8f36a6c766 -r 708291e9389c tests/test-convert.out --- a/tests/test-convert.out Tue Jul 27 14:43:40 2010 +0200 +++ b/tests/test-convert.out Tue Jul 27 16:03:42 2010 -0500 @@ -65,7 +65,7 @@ rename path/to/source path/to/destination - Comment lines start with '#'. A specificed path matches if it equals the + Comment lines start with '#'. A specified path matches if it equals the full relative name of a file or one of its parent directories. The 'include' or 'exclude' directive with the longest matching path applies, so line order does not matter. @@ -74,7 +74,7 @@ be included in the destination repository, and the exclusion of all other files and directories not explicitly included. The 'exclude' directive causes files or directories to be omitted. The 'rename' directive renames - a file or directory if is converted. To rename from a subdirectory into + a file or directory if it is converted. To rename from a subdirectory into the root of the repository, use '.' as the path to rename to. The splicemap is a file that allows insertion of synthetic history, diff -r ee8f36a6c766 -r 708291e9389c tests/test-debugbuilddag --- a/tests/test-debugbuilddag Tue Jul 27 14:43:40 2010 +0200 +++ b/tests/test-debugbuilddag Tue Jul 27 16:03:42 2010 -0500 @@ -13,6 +13,8 @@ hg debugbuilddag '+2:f +3:p2 @temp