Hello community, here is the log from the commit of package hg-git for openSUSE:Factory checked in at 2014-08-20 10:51:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hg-git (Old) and /work/SRC/openSUSE:Factory/.hg-git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hg-git" Changes: -------- --- /work/SRC/openSUSE:Factory/hg-git/hg-git.changes 2014-05-27 12:00:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hg-git.new/hg-git.changes 2014-08-20 10:51:26.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 18 14:51:29 UTC 2014 - [email protected] + +- update to version 0.6.1 + - no changelog provided, see + https://bitbucket.org/durin42/hg-git/commits/tag/0.6.0 for a + detailed list of changes + +------------------------------------------------------------------- Old: ---- 0.6.0.tar.bz2 New: ---- 0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hg-git.spec ++++++ --- /var/tmp/diff_new_pack.LuuzOF/_old 2014-08-20 10:51:27.000000000 +0200 +++ /var/tmp/diff_new_pack.LuuzOF/_new 2014-08-20 10:51:27.000000000 +0200 @@ -16,10 +16,10 @@ # -%define rev 9f20b66027c2 +%define rev f67747f18f20 Name: hg-git -Version: 0.6.0 +Version: 0.6.1 Release: 0 Summary: Mercurial Plugin for Communicating with Git Servers License: GPL-2.0+ ++++++ 0.6.0.tar.bz2 -> 0.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/.hg_archival.txt new/durin42-hg-git-f67747f18f20/.hg_archival.txt --- old/durin42-hg-git-9f20b66027c2/.hg_archival.txt 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/.hg_archival.txt 2014-08-01 16:04:03.000000000 +0200 @@ -1,4 +1,4 @@ repo: 06366111af3c6a2ffa06333ed60d3ed3b9ec0763 -node: 9f20b66027c259e498a96454cf4c380e9440d769 +node: f67747f18f20e97eff459aa24a70a23a2b3730a9 branch: default -tag: 0.6.0 +tag: 0.6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/.hgsigs new/durin42-hg-git-f67747f18f20/.hgsigs --- old/durin42-hg-git-9f20b66027c2/.hgsigs 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/.hgsigs 2014-08-01 16:04:03.000000000 +0200 @@ -1 +1,2 @@ 2f7bd8db709f8cf27107839951e88a38f915709d 0 iQIcBAABAgAGBQJSrI/JAAoJELnJ3IJKpb3VTroP/iK6eHVLtwDlsOqyEHCGP9CYw0Gd8bCq46YWZsVmz3bj01dKFwWSPKtFv+PNKFMGa8UV5VsEKCMoby2hzX6+beKs7oNLMU2YUGhP9A1QvQtpB5MArEMXWrQXeJTJZoZfA+2K2AgPJdeo1cLWKHIBc8IcG6yl9K55ummHwyg96KDna3fWrARxgLMNOBAva7otCSW/nQ0raABXi+JklBtB2C+Glxc3amnQQaWO659/DK0V2YS/54tiHJ73iJDlvm0bk+cgMUwtsgGJHFkLtCkbVA0tmDmsZBPaokRkgiJTEnqBLjKXoOqeoktAxdxSVHSEbIxx6guPhOtV0/cZsseShWQ7+3L1rCw6ujvqm9aBithb04LgfkJRZyXuV6NdbYaS+Y1guLJAEbkjmJplswxMI/laEFV5yTyPTQ2a4pTYuOx9Ix4jtDgpqzKztEc1hVk+dX/B2WWOjH+eLOYriAJSIUC+57GLA6WpeKMYYRZoIUhwM0TUjD3ePX9bIkUp4vIFUTdZV45TCsanJ+3rTIXiZh/C/O/jauNQ6wa2rkpmD4YRKb89YSbst6pdIaHDNBrnQppxD9DvYAO9ToFLCp+IfPxBdM5jvb9Wsmcw9p/3awfdII3W9mk/MOAJzEfPJLjWZbWaGHKrnPlQdBl/BP03ueCqZ/pw4Chm20WSAAFfqWam +29f51877a61078371d428a424799272e22d00810 0 iQIcBAABAgAGBQJTcpG4AAoJELnJ3IJKpb3VuEgP/RKdNxF5qRaHMtW3AEboeHamVSuAqaro+2W2RYjEuawK97agByGUcjxU4FuvzuRTvVUIrcim1PsXOw5pr30AA9alyQ7zAzs0KOx/lUkQ0cXJ4a0kKF/Um2Angx4uVausloa7A21fgB5GBdDP/47pN5G7ycAoi9rDkRNk9xvHnVXeAmIrg9IWrMoj31f/wQal7mmX0GS5SNAsWCjEfnUe5UYIsxTcWkAzyCggv/fSJdOfZ3qExeBACHr5Bo2twtY5GWlUWKYA3Pk9FthC4sQ1uPSghaHhTuXS38ZxSouU9WSq+hBkmv6dg8DFKlqHMiuet80ex1EWU6VHANmNnndHi33fsKJnojMzVmBJ28u2TLKoZLhIn46OdLs9hhj4+aPACPI1I0+3CIeQ57MNWstTL3CU9uiTgZ89akbEHax8EtsEElB83f5aXWQ7jerLPr1XGyv788NTeuTjBvYdAJz0ymkmhm4867TPAYU4A9rwEpgrlksVXmZD3aK0M2yQovlgfYmQaQ34DnzPTQNNKrd1fzp6PG4MTqecHz0O0S/ie+9AJSN4dht3rnsHyoIP20V4I1cjqqfQVEVXfKv+hPbdw2TDleRUr6EaPVcViM1LlZFezE0UUKRhz3n+PFkrC3Ssf9EfHAkjH439GULe3ezgfXCzsGubtaRnIuF7IB/XJ/gS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/.hgtags new/durin42-hg-git-f67747f18f20/.hgtags --- old/durin42-hg-git-9f20b66027c2/.hgtags 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/.hgtags 2014-08-01 16:04:03.000000000 +0200 @@ -13,3 +13,4 @@ 586b7aa9646641b3b1083ab349bb186c79aa646b 0.3.4 a3c3b8077cbeec7c381a4b312d722d575a738610 0.4.0 ef41e87ea11afdabfa6583e2c86dec375c67b2a4 0.5.0 +9f20b66027c259e498a96454cf4c380e9440d769 0.6.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/MANIFEST.in new/durin42-hg-git-f67747f18f20/MANIFEST.in --- old/durin42-hg-git-9f20b66027c2/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100 +++ new/durin42-hg-git-f67747f18f20/MANIFEST.in 2014-08-01 16:04:03.000000000 +0200 @@ -0,0 +1,5 @@ +include COPYING +include MANIFEST.in +include README.md + +recursive-include hggit *.py *.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/Makefile new/durin42-hg-git-f67747f18f20/Makefile --- old/durin42-hg-git-9f20b66027c2/Makefile 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/Makefile 2014-08-01 16:04:03.000000000 +0200 @@ -25,6 +25,6 @@ # latest Ubuntu LTS release (2.8.2 for 14.04 LTS) may be dropped if they # interfere with new development. The latest released minor version should be # listed for each major version; earlier minor versions are not needed. -all-version-tests: tests-2.8.2 tests-tip +all-version-tests: tests-2.8.2 tests-3.0.1 tests-@ .PHONY: tests all-version-tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/README.md new/durin42-hg-git-f67747f18f20/README.md --- old/durin42-hg-git-9f20b66027c2/README.md 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/README.md 2014-08-01 16:04:03.000000000 +0200 @@ -23,9 +23,9 @@ This plugin is implemented entirely in Python - there are no Git binary dependencies, you do not need to have Git installed on your -system. The only dependencies are Mercurial and Dulwich. The plugin -is known to work on Hg versions 2.0.2 through 2.3.1 and requires at least -Dulwich 0.8.6. +system. The only dependencies are Mercurial and Dulwich. See the +Makefile for information about which versions of Mercurial are +known to work, and setup.py for which versions of Dulwich are required. Usage ===== @@ -76,7 +76,7 @@ Hg-Git can also be used to convert a Mercurial repository to Git. You can use a local repository or a remote repository accessed via SSH, HTTP or HTTPS. Use -the following commands to convert the repository (it assumes your running this +the following commands to convert the repository (it assumes you're running this in $HOME). $ mkdir git-repo; cd git-repo; git init; cd .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/hggit/__init__.py new/durin42-hg-git-f67747f18f20/hggit/__init__.py --- old/durin42-hg-git-9f20b66027c2/hggit/__init__.py 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/hggit/__init__.py 2014-08-01 16:04:03.000000000 +0200 @@ -22,6 +22,7 @@ import os from mercurial import bundlerepo +from mercurial import cmdutil from mercurial import commands from mercurial import demandimport from mercurial import dirstate @@ -33,6 +34,7 @@ from mercurial import localrepo from mercurial.node import hex from mercurial import revset +from mercurial import scmutil from mercurial import templatekw from mercurial import util as hgutil from mercurial import url @@ -46,9 +48,12 @@ from git_handler import GitHandler import verify -testedwith = '2.0.2 2.1.2 2.2.3 2.8.1' +testedwith = '2.8.2 3.0.1' buglink = 'https://bitbucket.org/durin42/hg-git/issues' +cmdtable = {} +command = cmdutil.command(cmdtable) + # support for `hg clone git://github.com/defunkt/facebox.git` # also hg clone git+ssh://[email protected]/schacon/simplegit.git _gitschemes = ('git', 'git+ssh', 'git+http', 'git+https') @@ -116,18 +121,36 @@ klass = hgrepo.generate_repo_subclass(repo.__class__) repo.__class__ = klass +@command('gimport') def gimport(ui, repo, remote_name=None): + '''import commits from Git to Mercurial''' repo.githandler.import_commits(remote_name) +@command('gexport') def gexport(ui, repo): + '''export commits from Mercurial to Git''' repo.githandler.export_commits() +@command('gclear') def gclear(ui, repo): + '''clear out the Git cached data''' repo.ui.status(_("clearing out the git cache data\n")) repo.githandler.clear() -from mercurial import dirstate -from mercurial import ignore +@command('gverify', + [('r', 'rev', '', _('revision to verify'), _('REV'))], + _('[-r REV]')) +def gverify(ui, repo, **opts): + '''verify that a Mercurial rev matches the corresponding Git rev + + Given a Mercurial revision that has a corresponding Git revision in the map, + this attempts to answer whether that revision has the same contents as the + corresponding Git revision. + + ''' + ctx = scmutil.revsingle(repo, opts.get('rev'), '.') + return verify.verify(ui, repo, ctx) + if (getattr(dirstate, 'rootcache', False) and getattr(ignore, 'readpats', False)): # only install our dirstate wrapper if it has a hope of working @@ -135,7 +158,9 @@ extensions.wrapfunction(ignore, 'ignore', gitdirstate.gignore) dirstate.dirstate = gitdirstate.gitdirstate +@command('git-cleanup') def git_cleanup(ui, repo): + '''clean up Git commit map after history editing''' new_map = [] for line in repo.opener(GitHandler.mapfile): gitsha, hgsha = line.strip().split(' ', 1) @@ -219,15 +244,3 @@ gitnode = '' return gitnode -cmdtable = { - "gimport": - (gimport, [], _('hg gimport')), - "gexport": - (gexport, [], _('hg gexport')), - "gclear": - (gclear, [], _('Clears out the Git cached data')), - "git-cleanup": (git_cleanup, [], _( - "Cleans up git repository after history editing")), - "gverify": (verify.verify, - [('r', 'rev', '', _('revision to verify'), _('REV'))], _('[-r REV]')), -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/hggit/git_handler.py new/durin42-hg-git-f67747f18f20/hggit/git_handler.py --- old/durin42-hg-git-9f20b66027c2/hggit/git_handler.py 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/hggit/git_handler.py 2014-08-01 16:04:03.000000000 +0200 @@ -23,6 +23,7 @@ from mercurial.node import hex, bin, nullid from mercurial import context, util as hgutil from mercurial import error +from mercurial import url import _ssh import hg2git @@ -135,17 +136,13 @@ def init_author_file(self): self.author_map = {} if self.ui.config('git', 'authors'): - f = open(self.repo.wjoin( - self.ui.config('git', 'authors'))) - try: + with open(self.repo.wjoin(self.ui.config('git', 'authors'))) as f: for line in f: line = line.strip() if not line or line.startswith('#'): continue from_, to = RE_AUTHOR_FILE.split(line, 2) self.author_map[from_] = to - finally: - f.close() ## FILE LOAD AND SAVE METHODS @@ -817,7 +814,16 @@ e = fc.flags() copied_path = fc.renamed() - return context.memfilectx(f, data, 'l' in e, 'x' in e, copied_path) + try: + return context.memfilectx(self.repo, f, data, + islink='l' in e, + isexec='x' in e, + copied=copied_path) + except TypeError: + return context.memfilectx(f, data, + islink='l' in e, + isexec='x' in e, + copied=copied_path) p1, p2 = (nullid, nullid) octopus = False @@ -828,6 +834,8 @@ ctx = context.memctx(self.repo, (p1, p2), text, list(files) + findconvergedfiles(p1, p2), getfilectx, author, date, {'hg-git': 'octopus'}) + # See comment below about setting substate to None. + ctx.substate = None return hex(self.repo.commitctx(ctx)) octopus = len(gparents) > 2 @@ -869,7 +877,14 @@ ctx = context.memctx(self.repo, (p1, p2), text, list(files) + findconvergedfiles(p1, p2), getfilectx, author, date, extra) - + # Starting Mercurial commit d2743be1bb06, memctx imports from + # committablectx. This means that it has a 'substate' property that + # contains the subrepo state. Ordinarily, Mercurial expects the subrepo + # to be present while making a new commit -- since hg-git is importing + # purely in-memory commits without backing stores for the subrepos, that + # won't work. Forcibly set the substate to None so that there's no + # attempt to read subrepos. + ctx.substate = None node = self.repo.commitctx(ctx) self.swap_out_encoding(oldenc) @@ -1389,7 +1404,7 @@ if port: client.port = port - return transport(host, thin_packs=False, port=port), path + return transport(host, port=port), path httpclient = getattr(client, 'HttpGitClient', None) @@ -1400,45 +1415,17 @@ if not httpclient: raise RepoError('git via HTTP requires dulwich 0.8.1 or later') else: - auth_handler = urllib2.HTTPBasicAuthHandler(AuthManager(self.ui)) + auth_handler = urllib2.HTTPBasicAuthHandler(url.passwordmgr(self.ui)) opener = urllib2.build_opener(auth_handler) try: - return client.HttpGitClient(uri, opener=opener, thin_packs=False), uri + return client.HttpGitClient(uri, opener=opener), uri except TypeError as e: if e.message.find("unexpected keyword argument 'opener'") >= 0: # using a version of dulwich that doesn't support # http(s) authentication -- try without authentication - return client.HttpGitClient(uri, thin_packs=False), uri + return client.HttpGitClient(uri), uri else: raise # if its not git or git+ssh, try a local url.. - return client.SubprocessGitClient(thin_packs=False), uri - -class AuthManager(object): - def __init__(self, ui): - self.ui = ui - - def add_password(self, realm, uri, user, passwd): - raise NotImplementedError( - 'AuthManager currently gets passwords from hg repo config') - - def find_user_password(self, realm, authuri): - - # find a stanza in the auth section which matches this uri - for item in self.ui.configitems('auth'): - if len(item) < 2: - continue - if item[0].endswith('.prefix') and authuri.startswith(item[1]): - prefix = item[0][:-len('.prefix')] - break - else: - # no matching stanza found! - return (None,None) - - self.ui.note(_('using "%s" auth credentials\n') % (prefix,)) - username = self.ui.config('auth', '%s.username' % prefix) - password = self.ui.config('auth', '%s.password' % prefix) - - return (username,password) - + return client.SubprocessGitClient(), uri diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/hggit/verify.py new/durin42-hg-git-f67747f18f20/hggit/verify.py --- old/durin42-hg-git-9f20b66027c2/hggit/verify.py 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/hggit/verify.py 2014-08-01 16:04:03.000000000 +0200 @@ -16,7 +16,7 @@ from dulwich import diff_tree from dulwich.objects import Commit, S_IFGITLINK -def verify(ui, repo, **opts): +def verify(ui, repo, hgctx): '''verify that a Mercurial rev matches the corresponding Git rev Given a Mercurial revision that has a corresponding Git revision in the map, @@ -24,8 +24,6 @@ corresponding Git revision. ''' - hgctx = scmutil.revsingle(repo, opts.get('rev'), '.') - handler = repo.githandler gitsha = handler.map_git_get(hgctx.hex()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/setup.py new/durin42-hg-git-f67747f18f20/setup.py --- old/durin42-hg-git-9f20b66027c2/setup.py 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/setup.py 2014-08-01 16:04:03.000000000 +0200 @@ -11,7 +11,7 @@ setup( name='hg-git', - version='0.6.0', + version='0.6.1', author='The hg-git Authors', maintainer='Augie Fackler', maintainer_email='[email protected]', @@ -26,5 +26,6 @@ license='GPLv2', packages=['hggit'], package_data={ 'hggit': ['help/git.rst'] }, + include_package_data=True, install_requires=['dulwich>=0.9.4'] + extra_req, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-conflict-1.t new/durin42-hg-git-f67747f18f20/tests/test-conflict-1.t --- old/durin42-hg-git-9f20b66027c2/tests/test-conflict-1.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-conflict-1.t 2014-08-01 16:04:03.000000000 +0200 @@ -23,7 +23,7 @@ use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon resolve using first parent $ echo C > afile - $ hg resolve -m afile + $ hg resolve -m afile | egrep -v '^no more unresolved files$' || true $ hg ci -m "merge to C" $ hg log --graph --style compact | sed 's/\[.*\]//g' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-conflict-2.t new/durin42-hg-git-f67747f18f20/tests/test-conflict-2.t --- old/durin42-hg-git-9f20b66027c2/tests/test-conflict-2.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-conflict-2.t 2014-08-01 16:04:03.000000000 +0200 @@ -23,7 +23,7 @@ use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon resolve using second parent $ echo B > afile - $ hg resolve -m afile + $ hg resolve -m afile | egrep -v '^no more unresolved files$' || true $ hg ci -m "merge to B" $ hg log --graph --style compact | sed 's/\[.*\]//g' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-git-workflow.t new/durin42-hg-git-f67747f18f20/tests/test-git-workflow.t --- old/durin42-hg-git-9f20b66027c2/tests/test-git-workflow.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-git-workflow.t 2014-08-01 16:04:03.000000000 +0200 @@ -29,7 +29,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd gitrepo $ hg book master - $ hg up null + $ hg up null | egrep -v '^\(leaving bookmark master\)$' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo "[git]" >> .hg/hgrc $ echo "intree = True" >> .hg/hgrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-hg-author.t new/durin42-hg-git-f67747f18f20/tests/test-hg-author.t --- old/durin42-hg-git-9f20b66027c2/tests/test-hg-author.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-hg-author.t 2014-08-01 16:04:03.000000000 +0200 @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo beta > beta $ hg add beta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-hg-branch.t new/durin42-hg-git-f67747f18f20/tests/test-hg-branch.t --- old/durin42-hg-git-9f20b66027c2/tests/test-hg-branch.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-hg-branch.t 2014-08-01 16:04:03.000000000 +0200 @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg mv alpha beta $ fn_hg_commit -m 'rename alpha to beta' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-hg-tags-invalid.t new/durin42-hg-git-f67747f18f20/tests/test-hg-tags-invalid.t --- old/durin42-hg-git-9f20b66027c2/tests/test-hg-tags-invalid.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-hg-tags-invalid.t 2014-08-01 16:04:03.000000000 +0200 @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ fn_hg_tag alph#a $ fn_hg_tag bet*a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-hg-tags.t new/durin42-hg-git-f67747f18f20/tests/test-hg-tags.t --- old/durin42-hg-git-9f20b66027c2/tests/test-hg-tags.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-hg-tags.t 2014-08-01 16:04:03.000000000 +0200 @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ fn_hg_tag alpha $ hg push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-push.t new/durin42-hg-git-f67747f18f20/tests/test-push.t --- old/durin42-hg-git-9f20b66027c2/tests/test-push.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-push.t 2014-08-01 16:04:03.000000000 +0200 @@ -118,7 +118,7 @@ hg-git issue103 -- directories can lose information at hg-git export time - $ hg up master + $ hg up master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ mkdir dir1 $ echo alpha > dir1/alpha diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/durin42-hg-git-9f20b66027c2/tests/test-subrepos.t new/durin42-hg-git-f67747f18f20/tests/test-subrepos.t --- old/durin42-hg-git-9f20b66027c2/tests/test-subrepos.t 2014-05-13 23:42:05.000000000 +0200 +++ new/durin42-hg-git-f67747f18f20/tests/test-subrepos.t 2014-08-01 16:04:03.000000000 +0200 @@ -104,7 +104,7 @@ (run 'hg update' to get a working copy) We grep off the updating to active bookmark message from newer versions. When only 2.7 or later (or so) is supported, this grep should be dropped. - $ hg checkout -C | grep -v 'updating to active bookmark master' + $ hg checkout -C | grep -v 'updating to active bookmark master' | egrep -v '^\(activating bookmark master\)$' cloning subrepo hgsub from $TESTTMP/hgsub 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd .. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
