Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2015-12-13 09:38:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial" Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2015-11-12 19:39:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2015-12-13 09:38:12.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Dec 6 21:03:59 UTC 2015 - [email protected] + +- update to 3.6.2 + This is a regularly-scheduled bugfix release. + + docker: match more version of 'hg docker version' + + localrepo.commit: check all files for resolve state + + rebase: add returning value from pullrebase function + + resolve: restore .orig only after merge is fully complete + + share: wrap bmstore._writerepo for transaction sensitivity + + tags: create new sortdict for performance reasons + +------------------------------------------------------------------- Old: ---- mercurial-3.6.1.tar.gz New: ---- mercurial-3.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.rL9rN8/_old 2015-12-13 09:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.rL9rN8/_new 2015-12-13 09:38:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: mercurial -Version: 3.6.1 +Version: 3.6.2 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ ++++++ mercurial-3.6.1.tar.gz -> mercurial-3.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/.hgsigs new/mercurial-3.6.2/.hgsigs --- old/mercurial-3.6.1/.hgsigs 2015-11-09 23:24:14.000000000 +0100 +++ new/mercurial-3.6.2/.hgsigs 2015-12-02 03:18:29.000000000 +0100 @@ -115,3 +115,4 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/.hgtags new/mercurial-3.6.2/.hgtags --- old/mercurial-3.6.1/.hgtags 2015-11-09 23:24:14.000000000 +0100 +++ new/mercurial-3.6.2/.hgtags 2015-12-02 03:18:29.000000000 +0100 @@ -128,3 +128,4 @@ 9a466b9f9792e3ad7ae3fc6c43c3ff2e136b718d 3.5.2 b66e3ca0b90c3095ea28dfd39aa24247bebf5c20 3.6-rc 47dd34f2e7272be9e3b2a5a83cd0d20be44293f4 3.6 +1aa5083cbebbe7575c88f3402ab377539b484897 3.6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/PKG-INFO new/mercurial-3.6.2/PKG-INFO --- old/mercurial-3.6.1/PKG-INFO 2015-11-09 23:24:25.000000000 +0100 +++ new/mercurial-3.6.2/PKG-INFO 2015-12-02 03:18:41.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mercurial -Version: 3.6.1 +Version: 3.6.2 Summary: Fast scalable distributed SCM (revision control, version control) system Home-page: https://mercurial-scm.org/ Author: Matt Mackall and many others diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/contrib/dockerlib.sh new/mercurial-3.6.2/contrib/dockerlib.sh --- old/mercurial-3.6.1/contrib/dockerlib.sh 2015-11-09 23:24:06.000000000 +0100 +++ new/mercurial-3.6.2/contrib/dockerlib.sh 2015-12-02 03:18:25.000000000 +0100 @@ -14,8 +14,8 @@ fi $DOCKER -h 2> /dev/null | grep -q Jansens && { echo "Error: $DOCKER is the Docking System Tray - install docker.io instead"; exit 1; } - $DOCKER version | grep -q "^Client version:" || { echo "Error: unexpected output from \"$DOCKER version\""; exit 1; } - $DOCKER version | grep -q "^Server version:" || { echo "Error: could not get docker server version - check it is running and your permissions"; exit 1; } + $DOCKER version | grep -Eq "^Client( version)?:" || { echo "Error: unexpected output from \"$DOCKER version\""; exit 1; } + $DOCKER version | grep -Eq "^Server( version)?:" || { echo "Error: could not get docker server version - check it is running and your permissions"; exit 1; } } # Construct a container and leave its name in $CONTAINER for future use. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/hgext/rebase.py new/mercurial-3.6.2/hgext/rebase.py --- old/mercurial-3.6.1/hgext/rebase.py 2015-11-09 23:24:07.000000000 +0100 +++ new/mercurial-3.6.2/hgext/rebase.py 2015-12-02 03:18:26.000000000 +0100 @@ -1096,6 +1096,7 @@ def pullrebase(orig, ui, repo, *args, **opts): 'Call rebase after pull if the latter has been invoked with --rebase' + ret = None if opts.get('rebase'): wlock = lock = None try: @@ -1113,7 +1114,7 @@ pass commands.postincoming = _dummy try: - orig(ui, repo, *args, **opts) + ret = orig(ui, repo, *args, **opts) finally: commands.postincoming = origpostincoming revspostpull = len(repo) @@ -1140,7 +1141,9 @@ else: if opts.get('tool'): raise error.Abort(_('--tool can only be used with --rebase')) - orig(ui, repo, *args, **opts) + ret = orig(ui, repo, *args, **opts) + + return ret def _setrebasesetvisibility(repo, revs): """store the currently rebased set on the repo object diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/hgext/share.py new/mercurial-3.6.2/hgext/share.py --- old/mercurial-3.6.1/hgext/share.py 2015-11-09 23:24:07.000000000 +0100 +++ new/mercurial-3.6.2/hgext/share.py 2015-12-02 03:18:26.000000000 +0100 @@ -123,7 +123,7 @@ def extsetup(ui): extensions.wrapfunction(bookmarks.bmstore, 'getbkfile', getbkfile) extensions.wrapfunction(bookmarks.bmstore, 'recordchange', recordchange) - extensions.wrapfunction(bookmarks.bmstore, 'write', write) + extensions.wrapfunction(bookmarks.bmstore, '_writerepo', writerepo) extensions.wrapcommand(commands.table, 'clone', clone) def _hassharedbookmarks(repo): @@ -166,10 +166,11 @@ category = 'share-bookmarks' tr.addpostclose(category, lambda tr: self._writerepo(srcrepo)) -def write(orig, self): +def writerepo(orig, self, repo): # First write local bookmarks file in case we ever unshare - orig(self) + orig(self, repo) + if _hassharedbookmarks(self._repo): srcrepo = _getsrcrepo(self._repo) if srcrepo is not None: - self._writerepo(srcrepo) + orig(self, srcrepo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/mercurial/__version__.py new/mercurial-3.6.2/mercurial/__version__.py --- old/mercurial-3.6.1/mercurial/__version__.py 2015-11-09 23:24:23.000000000 +0100 +++ new/mercurial-3.6.2/mercurial/__version__.py 2015-12-02 03:18:38.000000000 +0100 @@ -1,2 +1,2 @@ # this file is autogenerated by setup.py -version = "3.6.1" +version = "3.6.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/mercurial/commands.py new/mercurial-3.6.2/mercurial/commands.py --- old/mercurial-3.6.1/mercurial/commands.py 2015-11-09 23:24:07.000000000 +0100 +++ new/mercurial-3.6.2/mercurial/commands.py 2015-12-02 03:18:26.000000000 +0100 @@ -5670,10 +5670,10 @@ ui.setconfig('ui', 'forcemerge', '', 'resolve') ms.commit() - # replace filemerge's .orig file with our resolve file - # for files in tocomplete, ms.resolve will not overwrite - # .orig -- only preresolve does - util.rename(a + ".resolve", a + ".orig") + # replace filemerge's .orig file with our resolve file, but only + # for merges that are complete + if complete: + util.rename(a + ".resolve", a + ".orig") for f in tocomplete: try: @@ -5687,6 +5687,10 @@ ui.setconfig('ui', 'forcemerge', '', 'resolve') ms.commit() + # replace filemerge's .orig file with our resolve file + a = repo.wjoin(f) + util.rename(a + ".resolve", a + ".orig") + ms.commit() if not didwork and pats: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/mercurial/localrepo.py new/mercurial-3.6.2/mercurial/localrepo.py --- old/mercurial-3.6.1/mercurial/localrepo.py 2015-11-09 23:24:06.000000000 +0100 +++ new/mercurial-3.6.2/mercurial/localrepo.py 2015-12-02 03:18:25.000000000 +0100 @@ -1556,19 +1556,12 @@ if merge and cctx.deleted(): raise error.Abort(_("cannot commit merge with missing files")) - unresolved, driverresolved = False, False ms = mergemod.mergestate(self) - for f in status.modified: - if f in ms: - if ms[f] == 'u': - unresolved = True - elif ms[f] == 'd': - driverresolved = True - if unresolved: + if list(ms.unresolved()): raise error.Abort(_('unresolved merge conflicts ' '(see "hg help resolve")')) - if driverresolved or ms.mdstate() != 's': + if ms.mdstate() != 's' or list(ms.driverresolved()): raise error.Abort(_('driver-resolved merge conflicts'), hint=_('run "hg resolve --all" to resolve')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/mercurial/tags.py new/mercurial-3.6.2/mercurial/tags.py --- old/mercurial-3.6.1/mercurial/tags.py 2015-11-09 23:24:06.000000000 +0100 +++ new/mercurial-3.6.2/mercurial/tags.py 2015-12-02 03:18:26.000000000 +0100 @@ -221,9 +221,13 @@ ''' filetags, nodelines = _readtaghist(ui, repo, lines, fn, recode=recode, calcnodelines=calcnodelines) + # util.sortdict().__setitem__ is much slower at replacing then inserting + # new entries. The difference can matter if there are thousands of tags. + # Create a new sortdict to avoid the performance penalty. + newtags = util.sortdict() for tag, taghist in filetags.items(): - filetags[tag] = (taghist[-1], taghist[:-1]) - return filetags + newtags[tag] = (taghist[-1], taghist[:-1]) + return newtags def _updatetags(filetags, tagtype, alltags, tagtypes): '''Incorporate the tag info read from one file into the two diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/tests/test-bundle-type.t new/mercurial-3.6.2/tests/test-bundle-type.t --- old/mercurial-3.6.1/tests/test-bundle-type.t 2015-11-09 23:24:06.000000000 +0100 +++ new/mercurial-3.6.2/tests/test-bundle-type.t 2015-12-02 03:18:26.000000000 +0100 @@ -34,7 +34,7 @@ > hg init t$t > cd t1 > hg bundle -t $t ../b$t ../t$t - > cut -b 1-6 ../b$t | head -n 1 + > f -q -B6 -D ../b$t; echo > cd ../t$t > hg debugbundle ../b$t > echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/tests/test-commit-unresolved.t new/mercurial-3.6.2/tests/test-commit-unresolved.t --- old/mercurial-3.6.1/tests/test-commit-unresolved.t 2015-11-09 23:24:06.000000000 +0100 +++ new/mercurial-3.6.2/tests/test-commit-unresolved.t 2015-12-02 03:18:26.000000000 +0100 @@ -43,4 +43,25 @@ (no more unresolved files) $ hg commit -m "Merged" +Test that if a file is removed but not marked resolved, the commit still fails +(issue4972) + + $ hg up ".^" + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg merge 2 + merging A + warning: conflicts while merging A! (edit, then use 'hg resolve --mark') + 1 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + [1] + $ hg rm --force A + $ hg commit -m merged + abort: unresolved merge conflicts (see "hg help resolve") + [255] + + $ hg resolve -ma + (no more unresolved files) + $ hg commit -m merged + created new head + $ cd .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/tests/test-resolve.t new/mercurial-3.6.2/tests/test-resolve.t --- old/mercurial-3.6.1/tests/test-resolve.t 2015-11-09 23:24:06.000000000 +0100 +++ new/mercurial-3.6.2/tests/test-resolve.t 2015-12-02 03:18:26.000000000 +0100 @@ -207,6 +207,30 @@ [1] $ grep '<<<' file1 > /dev/null +test .orig behavior with resolve + + $ echo resolve > file + $ hg resolve -q file1 --tool 'f --dump $TESTTMP/repo/file1.orig' + */file1~base*: (glob) + >>> + foo + <<< + */file1~other*: (glob) + >>> + foo + bar + <<< + $TESTTMP/repo/file1: (glob) + >>> + foo + baz + <<< + $TESTTMP/repo/file1.orig: (glob) + >>> + foo + baz + <<< + resolve <file> should do nothing if 'file' was marked resolved $ echo resolved > file1 $ hg resolve -m file1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.6.1/tests/test-shelve.t new/mercurial-3.6.2/tests/test-shelve.t --- old/mercurial-3.6.1/tests/test-shelve.t 2015-11-09 23:24:06.000000000 +0100 +++ new/mercurial-3.6.2/tests/test-shelve.t 2015-12-02 03:18:26.000000000 +0100 @@ -1174,3 +1174,42 @@ rebase aborted $ hg up -C . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ cd .. + +Keep active bookmark while (un)shelving even on shared repo (issue4940) +----------------------------------------------------------------------- + + $ cat <<EOF >> $HGRCPATH + > [extensions] + > share = + > EOF + + $ hg bookmarks -R repo + test 4:33f7f61e6c5e + $ hg share -B repo share + updating working directory + 6 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd share + + $ hg bookmarks + test 4:33f7f61e6c5e + $ hg bookmarks foo + $ hg bookmarks + * foo 5:703117a2acfb + test 4:33f7f61e6c5e + $ echo x >> x + $ hg shelve + shelved as foo + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg bookmarks + * foo 5:703117a2acfb + test 4:33f7f61e6c5e + + $ hg unshelve + unshelving change 'foo' + $ hg bookmarks + * foo 5:703117a2acfb + test 4:33f7f61e6c5e + + $ cd ..
