Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2012-12-28 22:45:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2012-11-12 07:04:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2012-12-28 22:45:11.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Dec 27 21:28:56 UTC 2012 - [email protected] + +- update to version 2.4.1 + (bugfix release) + amend: force editor only if old message is reused (issue3698) + grep: don't search past the end of the searched string + hooks: be even more forgiven of non-fd descriptors (issue3711) + hooks: delay I/O redirection until we actually run a hook (issue3711) + phases: fix missing "error" module import (issue3707) + rebase: fix pull --rev options clashing with --rebase (issue3619) + subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) + update: allow update to existing branches with invalid names (issue3710) + util: make chunkbuffer non-quadratic on Windows + +------------------------------------------------------------------- Old: ---- mercurial-2.4.tar.gz New: ---- mercurial-2.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.O6VSX5/_old 2012-12-28 22:45:12.000000000 +0100 +++ /var/tmp/diff_new_pack.O6VSX5/_new 2012-12-28 22:45:12.000000000 +0100 @@ -17,7 +17,7 @@ Name: mercurial -Version: 2.4 +Version: 2.4.1 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ ++++++ mercurial-2.4.tar.gz -> mercurial-2.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/.hgsigs new/mercurial-2.4.1/.hgsigs --- old/mercurial-2.4/.hgsigs 2012-11-01 22:09:21.000000000 +0100 +++ new/mercurial-2.4.1/.hgsigs 2012-12-03 21:03:57.000000000 +0100 @@ -60,3 +60,4 @@ 072209ae4ddb654eb2d5fd35bff358c738414432 0 iD8DBQBQQkq0ywK+sNU5EO8RArDTAJ9nk5CySnNAjAXYvqvx4uWCw9ThZwCgqmFRehH/l+oTwj3f8nw8u8qTCdc= b3f0f9a39c4e1d0250048cd803ab03542d6f140a 0 iD8DBQBQamltywK+sNU5EO8RAlsqAJ4qF/m6aFu4mJCOKTiAP5RvZFK02ACfawYShUZO6OXEFfveU0aAxDR0M1k= d118a4f4fd16d9b558ec3f3e87bfee772861d2b7 0 iD8DBQBQgPV5ywK+sNU5EO8RArylAJ0abcx5NlDjyv3ZDWpAfRIHyRsJtQCgn4TMuEayqgxzrvadQZHdTEU2g38= +195ad823b5d58c68903a6153a25e3fb4ed25239d 0 iD8DBQBQkuT9ywK+sNU5EO8RAhB4AKCeerItoK2Jipm2cVf4euGofAa/WACeJj3TVd4pFILpb+ogj7ebweFLJi0= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/.hgtags new/mercurial-2.4.1/.hgtags --- old/mercurial-2.4/.hgtags 2012-11-01 22:09:21.000000000 +0100 +++ new/mercurial-2.4.1/.hgtags 2012-12-03 21:03:57.000000000 +0100 @@ -73,3 +73,4 @@ 072209ae4ddb654eb2d5fd35bff358c738414432 2.3.1 b3f0f9a39c4e1d0250048cd803ab03542d6f140a 2.3.2 d118a4f4fd16d9b558ec3f3e87bfee772861d2b7 2.4-rc +195ad823b5d58c68903a6153a25e3fb4ed25239d 2.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/PKG-INFO new/mercurial-2.4.1/PKG-INFO --- old/mercurial-2.4/PKG-INFO 2012-11-01 22:09:27.000000000 +0100 +++ new/mercurial-2.4.1/PKG-INFO 2012-12-03 21:04:04.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: mercurial -Version: 2.4 +Version: 2.4.1 Summary: Scalable distributed SCM Home-page: http://mercurial.selenic.com/ Author: Matt Mackall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/hgext/rebase.py new/mercurial-2.4.1/hgext/rebase.py --- old/mercurial-2.4/hgext/rebase.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/hgext/rebase.py 2012-12-03 21:03:49.000000000 +0100 @@ -706,6 +706,10 @@ commands.postincoming = origpostincoming revspostpull = len(repo) if revspostpull > revsprepull: + # --rev option from pull conflict with rebase own --rev + # dropping it + if 'rev' in opts: + del opts['rev'] rebase(ui, repo, **opts) branch = repo[None].branch() dest = repo[branch].rev() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/__version__.py new/mercurial-2.4.1/mercurial/__version__.py --- old/mercurial-2.4/mercurial/__version__.py 2012-11-01 22:09:25.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/__version__.py 2012-12-03 21:04:02.000000000 +0100 @@ -1,2 +1,2 @@ # this file is autogenerated by setup.py -version = "2.4" +version = "2.4.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/changelog.py new/mercurial-2.4.1/mercurial/changelog.py --- old/mercurial-2.4/mercurial/changelog.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/changelog.py 2012-12-03 21:03:50.000000000 +0100 @@ -134,9 +134,15 @@ def __iter__(self): """filtered version of revlog.__iter__""" - for i in xrange(len(self)): - if i not in self.filteredrevs: - yield i + if len(self.filteredrevs) == 0: + return revlog.revlog.__iter__(self) + + def filterediter(): + for i in xrange(len(self)): + if i not in self.filteredrevs: + yield i + + return filterediter() def revs(self, start=0, stop=None): """filtered version of revlog.revs""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/cmdutil.py new/mercurial-2.4.1/mercurial/cmdutil.py --- old/mercurial-2.4/mercurial/cmdutil.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/cmdutil.py 2012-12-03 21:03:50.000000000 +0100 @@ -627,7 +627,7 @@ # subpath. The best we can do is to ignore it. tempnode2 = None submatch = matchmod.narrowmatcher(subpath, match) - sub.diff(diffopts, tempnode2, submatch, changes=changes, + sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, stat=stat, fp=fp, prefix=prefix) class changeset_printer(object): @@ -1715,7 +1715,9 @@ user = opts.get('user') or old.user() date = opts.get('date') or old.date() + editmsg = False if not message: + editmsg = True message = old.description() pureextra = extra.copy() @@ -1729,7 +1731,8 @@ user=user, date=date, extra=extra) - new._text = commitforceeditor(repo, new, []) + if editmsg: + new._text = commitforceeditor(repo, new, []) newdesc = changelog.stripdesc(new.description()) if ((not node) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/commands.py new/mercurial-2.4.1/mercurial/commands.py --- old/mercurial-2.4/mercurial/commands.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/commands.py 2012-12-03 21:03:50.000000000 +0100 @@ -924,6 +924,7 @@ ' exists'), # i18n: "it" refers to an existing branch hint=_("use 'hg update' to switch to it")) + scmutil.checknewlabel(None, label, 'branch') repo.dirstate.setbranch(label) ui.status(_('marked working directory as branch %s\n') % label) ui.status(_('(branches are permanent and global, ' @@ -2935,7 +2936,7 @@ def matchlines(body): begin = 0 linenum = 0 - while True: + while begin < len(body): match = regexp.search(body, begin) if not match: break @@ -4495,7 +4496,7 @@ else: ui.write("%s = %s\n" % (name, util.hidepassword(path))) -@command('^phase', +@command('phase', [('p', 'public', False, _('set changeset phase to public')), ('d', 'draft', False, _('set changeset phase to draft')), ('s', 'secret', False, _('set changeset phase to secret')), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/dirstate.py new/mercurial-2.4.1/mercurial/dirstate.py --- old/mercurial-2.4/mercurial/dirstate.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/dirstate.py 2012-12-03 21:03:50.000000000 +0100 @@ -261,7 +261,6 @@ def setbranch(self, branch): # no repo object here, just check for reserved names - scmutil.checknewlabel(None, branch, 'branch') self._branch = encoding.fromlocal(branch) f = self._opener('branch', 'w', atomictemp=True) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/hook.py new/mercurial-2.4.1/mercurial/hook.py --- old/mercurial-2.4/mercurial/hook.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/hook.py 2012-12-03 21:03:50.000000000 +0100 @@ -142,25 +142,26 @@ return False r = False - oldstdout = -1 - if _redirect: - try: - stdoutno = sys.__stdout__.fileno() - stderrno = sys.__stderr__.fileno() - # temporarily redirect stdout to stderr, if possible - if stdoutno >= 0 and stderrno >= 0: - sys.__stdout__.flush() - oldstdout = os.dup(stdoutno) - os.dup2(stderrno, stdoutno) - except AttributeError: - # __stdout__/__stderr__ doesn't have fileno(), it's not a real file - pass try: for hname, cmd in _allhooks(ui): if hname.split('.')[0] != name or not cmd: continue + + if oldstdout == -1 and _redirect: + try: + stdoutno = sys.__stdout__.fileno() + stderrno = sys.__stderr__.fileno() + # temporarily redirect stdout to stderr, if possible + if stdoutno >= 0 and stderrno >= 0: + sys.__stdout__.flush() + oldstdout = os.dup(stdoutno) + os.dup2(stderrno, stdoutno) + except (OSError, AttributeError): + # files seem to be bogus, give up on redirecting (WSGI, etc) + pass + if util.safehasattr(cmd, '__call__'): r = _pythonhook(ui, repo, name, hname, cmd, args, throw) or r elif cmd.startswith('python:'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/phases.py new/mercurial-2.4.1/mercurial/phases.py --- old/mercurial-2.4/mercurial/phases.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/phases.py 2012-12-03 21:03:50.000000000 +0100 @@ -103,7 +103,7 @@ import errno from node import nullid, nullrev, bin, hex, short from i18n import _ -import util +import util, error import obsolete allphases = public, draft, secret = range(3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/revlog.py new/mercurial-2.4.1/mercurial/revlog.py --- old/mercurial-2.4/mercurial/revlog.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/revlog.py 2012-12-03 21:03:50.000000000 +0100 @@ -254,8 +254,7 @@ def __len__(self): return len(self.index) - 1 def __iter__(self): - for i in xrange(len(self)): - yield i + return iter(xrange(len(self))) def revs(self, start=0, stop=None): """iterate over all rev in this revlog (from start to stop)""" if stop is None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/subrepo.py new/mercurial-2.4.1/mercurial/subrepo.py --- old/mercurial-2.4/mercurial/subrepo.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/subrepo.py 2012-12-03 21:03:50.000000000 +0100 @@ -330,7 +330,7 @@ def status(self, rev2, **opts): return [], [], [], [], [], [], [] - def diff(self, diffopts, node2, match, prefix, **opts): + def diff(self, ui, diffopts, node2, match, prefix, **opts): pass def outgoing(self, ui, dest, opts): @@ -437,14 +437,14 @@ % (inst, subrelpath(self))) return [], [], [], [], [], [], [] - def diff(self, diffopts, node2, match, prefix, **opts): + def diff(self, ui, diffopts, node2, match, prefix, **opts): try: node1 = node.bin(self._state[1]) # We currently expect node2 to come from substate and be # in hex format if node2 is not None: node2 = node.bin(node2) - cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, + cmdutil.diffordiffstat(ui, self._repo, diffopts, node1, node2, match, prefix=os.path.join(prefix, self._path), listsubrepos=True, **opts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/mercurial/util.py new/mercurial-2.4.1/mercurial/util.py --- old/mercurial-2.4/mercurial/util.py 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/mercurial/util.py 2012-12-03 21:03:50.000000000 +0100 @@ -899,7 +899,7 @@ """Read L bytes of data from the iterator of chunks of data. Returns less than L bytes if the iterator runs dry.""" left = l - buf = '' + buf = [] queue = self._queue while left > 0: # refill the queue @@ -917,11 +917,11 @@ left -= len(chunk) if left < 0: queue.appendleft(chunk[left:]) - buf += chunk[:left] + buf.append(chunk[:left]) else: - buf += chunk + buf.append(chunk) - return buf + return ''.join(buf) def filechunkiter(f, size=65536, limit=None): """Create a generator that produces the data in the file size Files old/mercurial-2.4/tests/bundles/test-invalid-branch-name.hg and new/mercurial-2.4.1/tests/bundles/test-invalid-branch-name.hg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-alias.t new/mercurial-2.4.1/tests/test-alias.t --- old/mercurial-2.4/tests/test-alias.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-alias.t 2012-12-03 21:03:50.000000000 +0100 @@ -350,7 +350,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -377,7 +376,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -404,7 +402,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-branches.t new/mercurial-2.4.1/tests/test-branches.t --- old/mercurial-2.4/tests/test-branches.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-branches.t 2012-12-03 21:03:50.000000000 +0100 @@ -68,6 +68,23 @@ abort: '\n' cannot be used in a name [255] +verify update will accept invalid legacy branch names + + $ hg init test-invalid-branch-name + $ cd test-invalid-branch-name + $ hg pull -u "$TESTDIR"/bundles/test-invalid-branch-name.hg + pulling from *test-invalid-branch-name.hg (glob) + requesting all changes + adding changesets + adding manifests + adding file changes + added 3 changesets with 3 changes to 2 files + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ hg update '"colon:test"' + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd .. + $ echo 'd' >d $ hg add d $ hg branch 'a branch name much longer than the default justification used by branches' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-commandserver.py.out new/mercurial-2.4.1/tests/test-commandserver.py.out --- old/mercurial-2.4/tests/test-commandserver.py.out 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-commandserver.py.out 2012-12-03 21:03:50.000000000 +0100 @@ -26,7 +26,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-commit-amend.t new/mercurial-2.4.1/tests/test-commit-amend.t --- old/mercurial-2.4/tests/test-commit-amend.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-commit-amend.t 2012-12-03 21:03:50.000000000 +0100 @@ -29,9 +29,10 @@ > EOF Amending changeset with changes in working dir: +(and check that --message does not trigger an editor) $ echo a >> a - $ hg ci --amend -m 'amend base1' + $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1' pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149 43f1ba15f28a tip saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob) @@ -66,10 +67,11 @@ Remove file that was added in amended commit: (and test logfile option) +(and test that logfile option do not trigger an editor) $ hg rm b $ echo 'amend base1 remove new file' > ../logfile - $ hg ci --amend -l ../logfile + $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob) $ hg cat b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-debugcomplete.t new/mercurial-2.4.1/tests/test-debugcomplete.t --- old/mercurial-2.4/tests/test-debugcomplete.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-debugcomplete.t 2012-12-03 21:03:50.000000000 +0100 @@ -201,7 +201,6 @@ init: ssh, remotecmd, insecure log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, hidden, patch, git, limit, no-merges, stat, graph, style, template, include, exclude merge: force, rev, preview, tool - phase: public, draft, secret, force, rev pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure remove: after, force, include, exclude @@ -261,6 +260,7 @@ outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos parents: rev, style, template paths: + phase: public, draft, secret, force, rev recover: rename: after, force, include, exclude, dry-run resolve: all, list, mark, unmark, no-status, tool, include, exclude diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-diff-color.t new/mercurial-2.4.1/tests/test-diff-color.t --- old/mercurial-2.4/tests/test-diff-color.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-diff-color.t 2012-12-03 21:03:50.000000000 +0100 @@ -125,6 +125,38 @@ c \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) + $ hg qpop -a + popping patch + patch queue now empty + #endif +issue3712: test colorization of subrepo diff + + $ hg init sub + $ echo b > sub/b + $ hg -R sub commit -Am 'create sub' + adding b + $ echo 'sub = sub' > .hgsub + $ hg add .hgsub + $ hg commit -m 'add subrepo sub' + $ echo aa >> a + $ echo bb >> sub/b + + $ hg diff --color=always -S + \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) + \x1b[0;31;1m--- a/a\x1b[0m (esc) + \x1b[0;32;1m+++ b/a\x1b[0m (esc) + \x1b[0;35m@@ -7,3 +7,4 @@\x1b[0m (esc) + a + c + c + \x1b[0;32m+aa\x1b[0m (esc) + \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc) + \x1b[0;31;1m--- a/sub/b\x1b[0m (esc) + \x1b[0;32;1m+++ b/sub/b\x1b[0m (esc) + \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) + b + \x1b[0;32m+bb\x1b[0m (esc) + $ cd .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-grep.t new/mercurial-2.4.1/tests/test-grep.t --- old/mercurial-2.4/tests/test-grep.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-grep.t 2012-12-03 21:03:50.000000000 +0100 @@ -23,6 +23,10 @@ simple + $ hg grep '.*' + port:4:export + port:4:vaportight + port:4:import/export $ hg grep port port port:4:export port:4:vaportight diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-help.t new/mercurial-2.4.1/tests/test-help.t --- old/mercurial-2.4/tests/test-help.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-help.t 2012-12-03 21:03:50.000000000 +0100 @@ -15,7 +15,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -37,7 +36,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -222,7 +220,6 @@ init create a new repository in the given directory log, history show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove, rm remove the specified files on the next commit @@ -536,7 +533,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -564,7 +560,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-mq-qrefresh.t new/mercurial-2.4.1/tests/test-mq-qrefresh.t --- old/mercurial-2.4/tests/test-mq-qrefresh.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-mq-qrefresh.t 2012-12-03 21:03:50.000000000 +0100 @@ -208,7 +208,7 @@ $ echo 'orphan' > orphanchild $ hg add orphanchild $ hg qrefresh nonexistentfilename # clear patch - nonexistentfilename: No such file or directory + nonexistentfilename: * (glob) $ hg qrefresh --short 1/base $ hg qrefresh --short 2/base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-phases.t new/mercurial-2.4.1/tests/test-phases.t --- old/mercurial-2.4/tests/test-phases.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-phases.t 2012-12-03 21:03:50.000000000 +0100 @@ -339,6 +339,15 @@ + +(Issue3707) +test invalid phase name + + $ mkcommit I --config phases.new-commit='babar' + transaction abort! + rollback completed + abort: phases.new-commit: not a valid phase name ('babar') + [255] Test phase command =================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-rebase-pull.t new/mercurial-2.4.1/tests/test-rebase-pull.t --- old/mercurial-2.4/tests/test-rebase-pull.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-rebase-pull.t 2012-12-03 21:03:50.000000000 +0100 @@ -114,3 +114,55 @@ | $ cd .. + +pull --rebase works when a specific revision is pulled (issue3619) + + $ cd a + $ hg tglog + @ 2: 'R1' + | + o 1: 'C2' + | + o 0: 'C1' + + $ echo R2 > R2 + $ hg ci -Am R2 + adding R2 + $ echo R3 > R3 + $ hg ci -Am R3 + adding R3 + $ cd ../c + $ hg tglog + o 2: 'R1' + | + @ 1: 'C2' + | + o 0: 'C1' + + $ echo L1 > L1 + $ hg ci -Am L1 + adding L1 + created new head + $ hg pull --rev tip --rebase + pulling from $TESTTMP/a + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files + saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) + $ hg tglog + @ 5: 'L1' + | + o 4: 'R3' + | + o 3: 'R2' + | + o 2: 'R1' + | + o 1: 'C2' + | + o 0: 'C1' + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-strict.t new/mercurial-2.4.1/tests/test-strict.t --- old/mercurial-2.4/tests/test-strict.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-strict.t 2012-12-03 21:03:50.000000000 +0100 @@ -29,7 +29,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.4/tests/test-subrepo.t new/mercurial-2.4.1/tests/test-subrepo.t --- old/mercurial-2.4/tests/test-subrepo.t 2012-11-01 22:09:16.000000000 +0100 +++ new/mercurial-2.4.1/tests/test-subrepo.t 2012-12-03 21:03:50.000000000 +0100 @@ -606,7 +606,7 @@ issue3276_ok $ rm repo/s/b $ hg -R repo revert --all - reverting repo/.hgsubstate + reverting repo/.hgsubstate (glob) reverting subrepo s $ hg -R repo update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
