Mercurial > hg
changeset 18731:c2d079387b2c
merge with stable
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 28 Feb 2013 14:51:59 +0100 |
| parents | 0ade08dcb3c3 (diff) a5d33446e46c (current diff) |
| children | 1793251e75c8 |
| files | hgext/largefiles/basestore.py hgext/largefiles/lfcommands.py hgext/largefiles/overrides.py hgext/largefiles/reposetup.py mercurial/templatefilters.py tests/test-largefiles-cache.t tests/test-largefiles.t |
| diffstat | 144 files changed, 1975 insertions(+), 937 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Feb 28 13:55:00 2013 +0100 +++ b/Makefile Thu Feb 28 14:51:59 2013 +0100 @@ -94,6 +94,9 @@ test-%: cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@ +check-code: + hg manifest | xargs python contrib/check-code.py + update-pot: i18n/hg.pot i18n/hg.pot: $(PYFILES) $(DOCFILES)
--- a/contrib/check-code.py Thu Feb 28 13:55:00 2013 +0100 +++ b/contrib/check-code.py Thu Feb 28 14:51:59 2013 +0100 @@ -80,6 +80,7 @@ (r'^diff.*-\w*N', "don't use 'diff -N'"), (r'\$PWD|\${PWD}', "don't use $PWD, use `pwd`"), (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\^', "^ must be quoted"), + (r'kill (`|\$\()', "don't use kill, use killdaemons.py") ] ] @@ -104,7 +105,10 @@ "use (glob) to match Windows paths too"), ], # warnings - [] + [ + (r'^ [^*?/\n]* \(glob\)$', + "warning: glob match with no glob character (?*/)"), + ] ] for i in [0, 1]:
--- a/contrib/perf.py Thu Feb 28 13:55:00 2013 +0100 +++ b/contrib/perf.py Thu Feb 28 14:51:59 2013 +0100 @@ -268,7 +268,7 @@ def perfrevset(ui, repo, expr, clear=False): """benchmark the execution time of a revset - Use the --clean option if need to evaluate the impact of build volative + Use the --clean option if need to evaluate the impact of build volatile revisions set cache on the revset execution. Volatile cache hold filtered and obsolete related cache.""" def d():
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hgext/blackbox.py Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,106 @@ +# blackbox.py - log repository events to a file for post-mortem debugging +# +# Copyright 2010 Nicolas Dumazet +# Copyright 2013 Facebook, Inc. +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2 or any later version. + +"""log repository events to a blackbox for debugging + +Logs event information to .hg/blackbox.log to help debug and diagnose problems. +The events that get logged can be configured via the blackbox.track config key. +Examples: + + [blackbox] + track = * + + [blackbox] + track = command, commandfinish, commandexception, exthook, pythonhook + + [blackbox] + track = incoming + +""" + +from mercurial import util, cmdutil +from mercurial.i18n import _ +import os, getpass, re + +cmdtable = {} +command = cmdutil.command(cmdtable) +testedwith = 'internal' +lastblackbox = None + +def wrapui(ui): + class blackboxui(ui.__class__): + @util.propertycache + def track(self): + return ui.configlist('blackbox', 'track', ['*']) + + def log(self, event, *msg, **opts): + global lastblackbox + super(blackboxui, self).log(event, *msg, **opts) + + if not '*' in self.track and not event in self.track: + return + + if util.safehasattr(self, '_blackbox'): + blackbox = self._blackbox + else: + # certain ui instances exist outside the context of + # a repo, so just default to the last blackbox that + # was seen. + blackbox = lastblackbox + + if blackbox: + date = util.datestr(None, '%Y/%m/%d %H:%M:%S') + user = getpass.getuser() + formattedmsg = msg[0] % msg[1:] + blackbox.write('%s %s> %s' % (date, user, formattedmsg)) + lastblackbox = blackbox + + def setrepo(self, repo): + self._blackbox = repo.opener('blackbox.log', 'a') + + ui.__class__ = blackboxui + +def uisetup(ui): + wrapui(ui) + +def reposetup(ui, repo): + # During 'hg pull' a httppeer repo is created to represent the remote repo. + # It doesn't have a .hg directory to put a blackbox in, so we don't do + # the blackbox setup for it. + if not repo.local(): + return + + ui.setrepo(repo) + +@command('^blackbox', + [('l', 'limit', 10, _('the number of events to show')), + ], + _('hg blackbox [OPTION]...')) +def blackbox(ui, repo, *revs, **opts): + '''view the recent repository events + ''' + + if not os.path.exists(repo.join('blackbox.log')): + return + + limit = opts.get('limit') + blackbox = repo.opener('blackbox.log', 'r') + lines = blackbox.read().split('\n') + + count = 0 + output = [] + for line in reversed(lines): + if count >= limit: + break + + # count the commands by matching lines like: 2013/01/23 19:13:36 root> + if re.match('^\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2} .*> .*', line): + count += 1 + output.append(line) + + ui.status('\n'.join(reversed(output)))
--- a/hgext/convert/cvsps.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/convert/cvsps.py Thu Feb 28 14:51:59 2013 +0100 @@ -508,9 +508,15 @@ ui.status(_('creating changesets\n')) + # try to order commitids by date + mindate = {} + for e in log: + if e.commitid: + mindate[e.commitid] = min(e.date, mindate.get(e.commitid)) + # Merge changesets - log.sort(key=lambda x: (x.commitid, x.comment, x.author, x.branch, x.date, - x.branchpoints)) + log.sort(key=lambda x: (mindate.get(x.commitid), x.commitid, x.comment, + x.author, x.branch, x.date, x.branchpoints)) changesets = [] files = set()
--- a/hgext/convert/git.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/convert/git.py Thu Feb 28 14:51:59 2013 +0100 @@ -6,6 +6,7 @@ # GNU General Public License version 2 or any later version. import os +import subprocess from mercurial import util, config from mercurial.node import hex, nullid from mercurial.i18n import _ @@ -29,13 +30,15 @@ # cannot remove environment variable. Just assume none have # both issues. if util.safehasattr(os, 'unsetenv'): - def gitopen(self, s, noerr=False): + def gitopen(self, s, err=None): prevgitdir = os.environ.get('GIT_DIR') os.environ['GIT_DIR'] = self.path try: - if noerr: + if err == subprocess.PIPE: (stdin, stdout, stderr) = util.popen3(s) return stdout + elif err == subprocess.STDOUT: + return self.popen_with_stderr(s) else: return util.popen(s, 'rb') finally: @@ -44,13 +47,25 @@ else: os.environ['GIT_DIR'] = prevgitdir else: - def gitopen(self, s, noerr=False): - if noerr: + def gitopen(self, s, err=None): + if err == subprocess.PIPE: (sin, so, se) = util.popen3('GIT_DIR=%s %s' % (self.path, s)) return so + elif err == subprocess.STDOUT: + return self.popen_with_stderr(s) else: return util.popen('GIT_DIR=%s %s' % (self.path, s), 'rb') + def popen_with_stderr(self, s): + p = subprocess.Popen(s, shell=True, bufsize=-1, + close_fds=util.closefds, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=False, + env=None) + return p.stdout + def gitread(self, s): fh = self.gitopen(s) data = fh.read() @@ -209,12 +224,15 @@ def gettags(self): tags = {} alltags = {} - fh = self.gitopen('git ls-remote --tags "%s"' % self.path) + fh = self.gitopen('git ls-remote --tags "%s"' % self.path, + err=subprocess.STDOUT) prefix = 'refs/tags/' # Build complete list of tags, both annotated and bare ones for line in fh: line = line.strip() + if line.startswith("error:") or line.startswith("fatal:"): + raise util.Abort(_('cannot read tags from %s') % self.path) node, tag = line.split(None, 1) if not tag.startswith(prefix): continue @@ -266,7 +284,7 @@ # Origin heads for reftype in gitcmd: try: - fh = self.gitopen(gitcmd[reftype], noerr=True) + fh = self.gitopen(gitcmd[reftype], err=subprocess.PIPE) for line in fh: line = line.strip() rev, name = line.split(None, 1)
--- a/hgext/factotum.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/factotum.py Thu Feb 28 14:51:59 2013 +0100 @@ -47,8 +47,8 @@ from mercurial.i18n import _ from mercurial.url import passwordmgr -from mercurial import httpconnection, urllib2, util -import os +from mercurial import httpconnection, util +import os, urllib2 ERRMAX = 128
--- a/hgext/histedit.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/histedit.py Thu Feb 28 14:51:59 2013 +0100 @@ -179,7 +179,7 @@ def commitfuncfor(repo, src): """Build a commit function for the replacement of <src> - This function ensure we apply the same treatement to all changesets. + This function ensure we apply the same treatment to all changesets. - Add a 'histedit_source' entry in extra. @@ -498,8 +498,8 @@ keep = opts.get('keep', False) revs = between(repo, parent, topmost, keep) if not revs: - ui.warn(_('nothing to edit\n')) - return 1 + raise util.Abort(_('%s is not an ancestor of working directory') % + node.short(parent)) ctxs = [repo[r] for r in revs] rules = opts.get('commands', '') @@ -583,7 +583,7 @@ if not newchildren: # `parentctxnode` should match but no result. This means that # currentnode is not a descendant from parentctxnode. - msg = _('working directory parent is not a descendant of %s') + msg = _('%s is not an ancestor of working directory') hint = _('update to %s or descendant and run "hg histedit ' '--continue" again') % parentctx raise util.Abort(msg % parentctx, hint=hint) @@ -626,7 +626,7 @@ newchildren) replacements.extend(repl) elif newchildren: - # otherwize update "parentctx" before proceding to further operation + # otherwise update "parentctx" before proceeding to further operation parentctx = repo[newchildren[-1]] return parentctx, replacements
--- a/hgext/largefiles/__init__.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/__init__.py Thu Feb 28 14:51:59 2013 +0100 @@ -41,11 +41,24 @@ enabled for this to work. When you pull a changeset that affects largefiles from a remote -repository, Mercurial behaves as normal. However, when you update to -such a revision, any largefiles needed by that revision are downloaded -and cached (if they have never been downloaded before). This means -that network access may be required to update to changesets you have -not previously updated to. +repository, the largefiles for the changeset won't be pulled down. +Instead, when you later update to such a revision, any largefiles +needed by that revision are downloaded and cached (if they have +never been downloaded before). This means that network access may +be required to update to changesets you have previously updated to. + +If you know you are pulling from a non-default location and want to +ensure that you will have the largefiles needed to merge or rebase +with new heads that you are pulling, then you can pull with the +--cache-largefiles flag to pre-emptively download any largefiles +that are new in the heads you are pulling. + +The one exception to the "largefiles won't be pulled until you update +to a revision that changes them" rule is when you pull new heads. +Because you could be pulling new heads (that you may later want to +merge with) from a non-default location (that Mercurial won't know +about later), when you pull new heads, largefiles revisions for those +heads are downloaded and cached locally. If you already have large files tracked by Mercurial without the largefiles extension, you will need to convert your repository in
--- a/hgext/largefiles/basestore.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/basestore.py Thu Feb 28 14:51:59 2013 +0100 @@ -43,7 +43,8 @@ raise NotImplementedError('abstract method') def exists(self, hashes): - '''Check to see if the store contains the given hashes.''' + '''Check to see if the store contains the given hashes. Given an + iterable of hashes it returns a mapping from hash to bool.''' raise NotImplementedError('abstract method') def get(self, files): @@ -98,10 +99,10 @@ '''Verify the existence (and, optionally, contents) of every big file revision referenced by every changeset in revs. Return 0 if all is well, non-zero on any errors.''' - write = self.ui.write failed = False - write(_('searching %d changesets for largefiles\n') % len(revs)) + self.ui.status(_('searching %d changesets for largefiles\n') % + len(revs)) verified = set() # set of (filename, filenode) tuples for rev in revs: @@ -115,12 +116,13 @@ numrevs = len(verified) numlfiles = len(set([fname for (fname, fnode) in verified])) if contents: - write(_('verified contents of %d revisions of %d largefiles\n') - % (numrevs, numlfiles)) + self.ui.status( + _('verified contents of %d revisions of %d largefiles\n') + % (numrevs, numlfiles)) else: - write(_('verified existence of %d revisions of %d largefiles\n') - % (numrevs, numlfiles)) - + self.ui.status( + _('verified existence of %d revisions of %d largefiles\n') + % (numrevs, numlfiles)) return int(failed) def _getfile(self, tmpfile, filename, hash): @@ -133,6 +135,11 @@ def _verifyfile(self, cctx, cset, contents, standin, verified): '''Perform the actual verification of a file in the store. + 'cset' is only used in warnings. + 'contents' controls verification of content hash. + 'standin' is the standin path of the largefile to verify. + 'verified' is maintained as a set of already verified files. + Returns _true_ if it is a standin and any problems are found! ''' raise NotImplementedError('abstract method')
--- a/hgext/largefiles/lfcommands.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/lfcommands.py Thu Feb 28 14:51:59 2013 +0100 @@ -368,9 +368,9 @@ ui.progress(_('uploading largefiles'), None) def verifylfiles(ui, repo, all=False, contents=False): - '''Verify that every big file revision in the current changeset + '''Verify that every largefile revision in the current changeset exists in the central store. With --contents, also verify that - the contents of each big file revision are correct (SHA-1 hash + the contents of each local largefile file revision are correct (SHA-1 hash matches the revision ID). With --all, check every changeset in this repository.''' if all:
--- a/hgext/largefiles/localstore.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/localstore.py Thu Feb 28 14:51:59 2013 +0100 @@ -63,23 +63,19 @@ return False expecthash = fctx.data()[0:40] + storepath = lfutil.storepath(self.remote, expecthash) verified.add(key) if not lfutil.instore(self.remote, expecthash): self.ui.warn( - _('changeset %s: %s missing\n' - ' (looked for hash %s)\n') - % (cset, filename, expecthash)) + _('changeset %s: %s references missing %s\n') + % (cset, filename, storepath)) return True # failed if contents: - storepath = lfutil.storepath(self.remote, expecthash) actualhash = lfutil.hashfile(storepath) if actualhash != expecthash: self.ui.warn( - _('changeset %s: %s: contents differ\n' - ' (%s:\n' - ' expected hash %s,\n' - ' but got %s)\n') - % (cset, filename, storepath, expecthash, actualhash)) + _('changeset %s: %s references corrupted %s\n') + % (cset, filename, storepath)) return True # failed return False
--- a/hgext/largefiles/overrides.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/overrides.py Thu Feb 28 14:51:59 2013 +0100 @@ -274,7 +274,7 @@ contents = opts.pop('lfc', False) result = orig(ui, repo, *pats, **opts) - if large: + if large or all or contents: result = result or lfcommands.verifylfiles(ui, repo, all, contents) return result @@ -360,15 +360,17 @@ # Finally, the merge.applyupdates function will then take care of # writing the files into the working copy and lfcommands.updatelfiles # will update the largefiles. -def overridemanifestmerge(origfn, repo, p1, p2, pa, overwrite, partial): - actions = origfn(repo, p1, p2, pa, overwrite, partial) +def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force, + partial): + overwrite = force and not branchmerge + actions = origfn(repo, p1, p2, pa, branchmerge, force, partial) processed = [] for action in actions: if overwrite: processed.append(action) continue - f, m = action[:2] + f, m, args, msg = action choices = (_('&Largefile'), _('&Normal file')) if m == "g" and lfutil.splitstandin(f) in p1 and f in p2: @@ -379,10 +381,10 @@ msg = _('%s has been turned into a largefile\n' 'use (l)argefile or keep as (n)ormal file?') % lfile if repo.ui.promptchoice(msg, choices, 0) == 0: - processed.append((lfile, "r")) - processed.append((standin, "g", p2.flags(standin))) + processed.append((lfile, "r", None, msg)) + processed.append((standin, "g", (p2.flags(standin),), msg)) else: - processed.append((standin, "r")) + processed.append((standin, "r", None, msg)) elif m == "g" and lfutil.standin(f) in p1 and f in p2: # Case 2: largefile in the working copy, normal file in # the second parent @@ -391,10 +393,10 @@ msg = _('%s has been turned into a normal file\n' 'keep as (l)argefile or use (n)ormal file?') % lfile if repo.ui.promptchoice(msg, choices, 0) == 0: - processed.append((lfile, "r")) + processed.append((lfile, "r", None, msg)) else: - processed.append((standin, "r")) - processed.append((lfile, "g", p2.flags(lfile))) + processed.append((standin, "r", None, msg)) + processed.append((lfile, "g", (p2.flags(lfile),), msg)) else: processed.append(action) @@ -724,18 +726,21 @@ repo.lfpullsource = source oldheads = lfutil.getcurrentheads(repo) result = orig(ui, repo, source, **opts) - # If we do not have the new largefiles for any new heads we pulled, we - # will run into a problem later if we try to merge or rebase with one of - # these heads, so cache the largefiles now directly into the system - # cache. - ui.status(_("caching new largefiles\n")) - numcached = 0 - heads = lfutil.getcurrentheads(repo) - newheads = set(heads).difference(set(oldheads)) - for head in newheads: - (cached, missing) = lfcommands.cachelfiles(ui, repo, head) - numcached += len(cached) - ui.status(_("%d largefiles cached\n") % numcached) + if opts.get('cache_largefiles'): + # If you are pulling from a remote location that is not your + # default location, you may want to cache largefiles for new heads + # that have been pulled, so you can easily merge or rebase with + # them later + numcached = 0 + heads = lfutil.getcurrentheads(repo) + newheads = set(heads).difference(set(oldheads)) + if len(newheads) > 0: + ui.status(_("caching largefiles for %s heads\n") % + len(newheads)) + for head in newheads: + (cached, missing) = lfcommands.cachelfiles(ui, repo, head) + numcached += len(cached) + ui.status(_("%d largefiles cached\n") % numcached) if opts.get('all_largefiles'): revspostpull = len(repo) revs = []
--- a/hgext/largefiles/remotestore.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/remotestore.py Thu Feb 28 14:51:59 2013 +0100 @@ -29,7 +29,7 @@ _('remotestore: put %s to remote store %s') % (source, self.url)) def exists(self, hashes): - return self._verify(hashes) + return dict((h, s == 0) for (h, s) in self._stat(hashes).iteritems()) def sendfile(self, filename, hash): self.ui.debug('remotestore: sendfile(%s, %s)\n' % (filename, hash)) @@ -76,9 +76,6 @@ infile = lfutil.limitreader(infile, length) return lfutil.copyandhash(lfutil.blockstream(infile), tmpfile) - def _verify(self, hashes): - return dict((h, s == 0) for (h, s) in self._stat(hashes).iteritems()) - def _verifyfile(self, cctx, cset, contents, standin, verified): filename = lfutil.splitstandin(standin) if not filename:
--- a/hgext/largefiles/reposetup.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/reposetup.py Thu Feb 28 14:51:59 2013 +0100 @@ -446,7 +446,7 @@ the largefiles. So we do the following: For directories that only have largefiles as matches, - we explicitly add the largefiles to the matchlist and remove + we explicitly add the largefiles to the match list and remove the directory. In other cases, we leave the match list unmodified. '''
--- a/hgext/largefiles/uisetup.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/largefiles/uisetup.py Thu Feb 28 14:51:59 2013 +0100 @@ -52,11 +52,12 @@ entry = extensions.wrapcommand(commands.table, 'verify', overrides.overrideverify) - verifyopt = [('', 'large', None, _('verify largefiles')), + verifyopt = [('', 'large', None, + _('verify that all largefiles in current revision exists')), ('', 'lfa', None, - _('verify all revisions of largefiles not just current')), + _('verify largefiles in all revisions, not just current')), ('', 'lfc', None, - _('verify largefile contents not just existence'))] + _('verify local largefile contents, not just existence'))] entry[1].extend(verifyopt) entry = extensions.wrapcommand(commands.table, 'debugstate', @@ -78,7 +79,9 @@ entry = extensions.wrapcommand(commands.table, 'pull', overrides.overridepull) pullopt = [('', 'all-largefiles', None, - _('download all pulled versions of largefiles'))] + _('download all pulled versions of largefiles')), + ('', 'cache-largefiles', None, + _('caches new largefiles in all pulled heads'))] entry[1].extend(pullopt) entry = extensions.wrapcommand(commands.table, 'clone', overrides.overrideclone)
--- a/hgext/mq.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/mq.py Thu Feb 28 14:51:59 2013 +0100 @@ -282,7 +282,7 @@ if phase is not None: backup = repo.ui.backupconfig('phases', 'new-commit') # Marking the repository as committing an mq patch can be used - # to optimize operations like _branchtags(). + # to optimize operations like branchtags(). repo._committingpatch = True try: if phase is not None: @@ -1571,7 +1571,7 @@ r = list(dd) a = list(aa) - # create 'match' that includes the files to be recommited. + # create 'match' that includes the files to be recommitted. # apply matchfn via repo.status to ensure correct case handling. cm, ca, cr, cd = repo.status(patchparent, match=matchfn)[:4] allmatches = set(cm + ca + cr + cd) @@ -3454,6 +3454,12 @@ % short(mqtags[-1][0])) return result + # do not add fake tags for filtered revisions + included = self.changelog.hasnode + mqtags = [mqt for mqt in mqtags if included(mqt[0])] + if not mqtags: + return result + mqtags.append((mqtags[-1][0], 'qtip')) mqtags.append((mqtags[0][0], 'qbase')) mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent'))
--- a/hgext/pager.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/pager.py Thu Feb 28 14:51:59 2013 +0100 @@ -94,6 +94,8 @@ @atexit.register def killpager(): + if util.safehasattr(signal, "SIGINT"): + signal.signal(signal.SIGINT, signal.SIG_IGN) pager.stdin.close() os.dup2(stdout, sys.stdout.fileno()) os.dup2(stderr, sys.stderr.fileno())
--- a/hgext/rebase.py Thu Feb 28 13:55:00 2013 +0100 +++ b/hgext/rebase.py Thu Feb 28 14:51:59 2013 +0100 @@ -692,8 +692,8 @@ # If we have multiple roots, we may have "hole" in the rebase set. # Rebase roots that descend from those "hole" should not be detached as # other root are. We use the special `revignored` to inform rebase that - # the revision should be ignored but that `defineparent` should search - # a rebase destination that make sense regarding rebaset topology. + # the revision should be ignored but that `defineparents` should search + # a rebase destination that make sense regarding rebased topology. rebasedomain = set(repo.revs('%ld::%ld', rebaseset, rebaseset)) for ignored in set(rebasedomain) - set(rebaseset): state[ignored] = revignored
--- a/mercurial/bdiff.c Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/bdiff.c Thu Feb 28 14:51:59 2013 +0100 @@ -347,6 +347,11 @@ if (!PyArg_ParseTuple(args, "s#s#:bdiff", &sa, &la, &sb, &lb)) return NULL; + if (la > UINT_MAX || lb > UINT_MAX) { + PyErr_SetString(PyExc_ValueError, "bdiff inputs too large"); + return NULL; + } + _save = PyEval_SaveThread(); an = splitlines(sa, la, &al); bn = splitlines(sb, lb, &bl); @@ -381,18 +386,9 @@ for (h = l.next; h; h = h->next) { if (h->a1 != la || h->b1 != lb) { len = bl[h->b1].l - bl[lb].l; - -#define checkputbe32(__x, __c) \ - if (__x > UINT_MAX) { \ - PyErr_SetString(PyExc_ValueError, \ - "bdiff: value too large for putbe32"); \ - goto nomem; \ - } \ - putbe32((uint32_t)(__x), __c); - - checkputbe32(al[la].l - al->l, rb); - checkputbe32(al[h->a1].l - al->l, rb + 4); - checkputbe32(len, rb + 8); + putbe32((uint32_t)(al[la].l - al->l), rb); + putbe32((uint32_t)(al[h->a1].l - al->l), rb + 4); + putbe32((uint32_t)len, rb + 8); memcpy(rb + 12, bl[lb].l, len); rb += 12 + len; }
--- a/mercurial/branchmap.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/branchmap.py Thu Feb 28 14:51:59 2013 +0100 @@ -95,7 +95,7 @@ def _hashfiltered(self, repo): """build hash of revision filtered in the current cache - Tracking tipnode and tiprev is not enough to ensure validaty of the + Tracking tipnode and tiprev is not enough to ensure validity of the cache as they do not help to distinct cache that ignored various revision bellow tiprev. @@ -114,9 +114,9 @@ return key def validfor(self, repo): - """Is the cache content valide regarding a repo + """Is the cache content valid regarding a repo - - False when cached tipnode are unknown or if we detect a strip. + - False when cached tipnode is unknown or if we detect a strip. - True when cache is up to date or a subset of current repo.""" try: return ((self.tipnode == repo.changelog.node(self.tiprev))
--- a/mercurial/bundlerepo.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/bundlerepo.py Thu Feb 28 14:51:59 2013 +0100 @@ -22,18 +22,15 @@ # How it works: # To retrieve a revision, we need to know the offset of the revision in # the bundle (an unbundle object). We store this offset in the index - # (start). - # - # basemap is indexed with revisions coming from the bundle, and it - # maps to the revision that is the base of the corresponding delta. + # (start). The base of the delta is stored in the base field. # # To differentiate a rev in the bundle from a rev in the revlog, we - # check revision against basemap. + # check revision against repotiprev. opener = scmutil.readonlyvfs(opener) revlog.revlog.__init__(self, opener, indexfile) self.bundle = bundle - self.basemap = {} # mapping rev to delta base rev n = len(self) + self.repotiprev = n - 1 chain = None self.bundlerevs = set() # used by 'bundle()' revset expression while True: @@ -68,9 +65,8 @@ baserev = self.rev(deltabase) # start, size, full unc. size, base (unused), link, p1, p2, node - e = (revlog.offset_type(start, 0), size, -1, -1, link, + e = (revlog.offset_type(start, 0), size, -1, baserev, link, self.rev(p1), self.rev(p2), node) - self.basemap[n] = baserev self.index.insert(-1, e) self.nodemap[node] = n self.bundlerevs.add(n) @@ -78,22 +74,22 @@ n += 1 def _chunk(self, rev): - # Warning: in case of bundle, the diff is against self.basemap, - # not against rev - 1 + # Warning: in case of bundle, the diff is against what we stored as + # delta base, not against rev - 1 # XXX: could use some caching - if rev not in self.basemap: + if rev <= self.repotiprev: return revlog.revlog._chunk(self, rev) self.bundle.seek(self.start(rev)) return self.bundle.read(self.length(rev)) def revdiff(self, rev1, rev2): """return or calculate a delta between two revisions""" - if rev1 in self.basemap and rev2 in self.basemap: + if rev1 > self.repotiprev and rev2 > self.repotiprev: # hot path for bundle - revb = self.basemap[rev2] + revb = self.index[rev2][3] if revb == rev1: return self._chunk(rev2) - elif rev1 not in self.basemap and rev2 not in self.basemap: + elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: return revlog.revlog.revdiff(self, rev1, rev2) return mdiff.textdiff(self.revision(self.node(rev1)), @@ -117,12 +113,12 @@ chain = [] iterrev = rev # reconstruct the revision if it is from a changegroup - while iterrev in self.basemap: + while iterrev > self.repotiprev: if self._cache and self._cache[1] == iterrev: text = self._cache[2] break chain.append(iterrev) - iterrev = self.basemap[iterrev] + iterrev = self.index[iterrev][3] if text is None: text = revlog.revlog.revision(self, iterrev)
--- a/mercurial/byterange.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/byterange.py Thu Feb 28 14:51:59 2013 +0100 @@ -238,7 +238,6 @@ unquote, addclosehook, addinfourl import ftplib import socket -import sys import mimetypes import email @@ -320,7 +319,7 @@ headers = email.message_from_string(headers) return addinfourl(fp, headers, req.get_full_url()) except ftplib.all_errors, msg: - raise IOError('ftp error', msg), sys.exc_info()[2] + raise IOError('ftp error', msg) def connect_ftp(self, user, passwd, host, port, dirs): fw = ftpwrapper(user, passwd, host, port, dirs) @@ -350,7 +349,7 @@ try: self.ftp.nlst(file) except ftplib.error_perm, reason: - raise IOError('ftp error', reason), sys.exc_info()[2] + raise IOError('ftp error', reason) # Restore the transfer mode! self.ftp.voidcmd(cmd) # Try to retrieve as a file @@ -364,7 +363,7 @@ fp = RangeableFileObject(fp, (rest,'')) return (fp, retrlen) elif not str(reason).startswith('550'): - raise IOError('ftp error', reason), sys.exc_info()[2] + raise IOError('ftp error', reason) if not conn: # Set transfer mode to ASCII! self.ftp.voidcmd('TYPE A')
--- a/mercurial/changelog.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/changelog.py Thu Feb 28 14:51:59 2013 +0100 @@ -183,7 +183,7 @@ """filtered version of revlog.rev""" r = super(changelog, self).rev(node) if r in self.filteredrevs: - raise error.LookupError(node, self.indexfile, _('no node')) + raise error.LookupError(hex(node), self.indexfile, _('no node')) return r def node(self, rev):
--- a/mercurial/cmdutil.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/cmdutil.py Thu Feb 28 14:51:59 2013 +0100 @@ -12,6 +12,7 @@ import match as matchmod import subrepo, context, repair, graphmod, revset, phases, obsolete import changelog +import bookmarks import lock as lockmod def parsealiases(cmd): @@ -169,7 +170,8 @@ inst.args[0]) def makefileobj(repo, pat, node=None, desc=None, total=None, - seqno=None, revwidth=None, mode='wb', pathname=None): + seqno=None, revwidth=None, mode='wb', modemap={}, + pathname=None): writable = mode not in ('r', 'rb') @@ -195,9 +197,11 @@ return pat if util.safehasattr(pat, 'read') and 'r' in mode: return pat - return open(makefilename(repo, pat, node, desc, total, seqno, revwidth, - pathname), - mode) + fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) + mode = modemap.get(fn, mode) + if mode == 'wb': + modemap[fn] = 'ab' + return open(fn, mode) def openrevlog(repo, cmd, file_, opts): """opens the changelog, manifest, a filelog or a given revlog""" @@ -538,6 +542,7 @@ total = len(revs) revwidth = max([len(str(rev)) for rev in revs]) + filemode = {} def single(rev, seqno, fp): ctx = repo[rev] @@ -553,7 +558,8 @@ desc_lines = ctx.description().rstrip().split('\n') desc = desc_lines[0] #Commit always has a first line. fp = makefileobj(repo, template, node, desc=desc, total=total, - seqno=seqno, revwidth=revwidth, mode='ab') + seqno=seqno, revwidth=revwidth, mode='wb', + modemap=filemode) if fp != template: shouldclose = True if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): @@ -569,6 +575,7 @@ write("# HG changeset patch\n") write("# User %s\n" % ctx.user()) write("# Date %d %d\n" % ctx.date()) + write("# %s\n" % util.datestr(ctx.date())) if branch and branch != 'default': write("# Branch %s\n" % branch) write("# Node ID %s\n" % hex(node)) @@ -1203,6 +1210,13 @@ if ff.match(x): wanted.discard(x) + # Choose a small initial window if we will probably only visit a + # few commits. + limit = loglimit(opts) + windowsize = 8 + if limit: + windowsize = min(limit, windowsize) + # Now that wanted is correctly initialized, we can iterate over the # revision range, yielding only revisions in wanted. def iterate(): @@ -1214,7 +1228,7 @@ def want(rev): return rev in wanted - for i, window in increasingwindows(0, len(revs)): + for i, window in increasingwindows(0, len(revs), windowsize): nrevs = [rev for rev in revs[i:i + window] if want(rev)] for rev in sorted(nrevs): fns = fncache.get(rev) @@ -1793,6 +1807,8 @@ edittext.append(_("HG: branch merge")) if ctx.branch(): edittext.append(_("HG: branch '%s'") % ctx.branch()) + if bookmarks.iscurrent(repo): + edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) edittext.extend([_("HG: subrepo %s") % s for s in subs]) edittext.extend([_("HG: added %s") % f for f in added]) edittext.extend([_("HG: changed %s") % f for f in modified]) @@ -1812,6 +1828,52 @@ return text +def commitstatus(repo, node, branch, bheads=None, opts={}): + ctx = repo[node] + parents = ctx.parents() + + if (not opts.get('amend') and bheads and node not in bheads and not + [x for x in parents if x.node() in bheads and x.branch() == branch]): + repo.ui.status(_('created new head\n')) + # The message is not printed for initial roots. For the other + # changesets, it is printed in the following situations: + # + # Par column: for the 2 parents with ... + # N: null or no parent + # B: parent is on another named branch + # C: parent is a regular non head changeset + # H: parent was a branch head of the current branch + # Msg column: whether we print "created new head" message + # In the following, it is assumed that there already exists some + # initial branch heads of the current branch, otherwise nothing is + # printed anyway. + # + # Par Msg Comment + # N N y additional topo root + # + # B N y additional branch root + # C N y additional topo head + # H N n usual case + # + # B B y weird additional branch root + # C B y branch merge + # H B n merge with named branch + # + # C C y additional head from merge + # C H n merge with a head + # + # H H n head merge: head count decreases + + if not opts.get('close_branch'): + for r in parents: + if r.closesbranch() and r.branch() == branch: + repo.ui.status(_('reopening closed branch head %d\n') % r) + + if repo.ui.debugflag: + repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) + elif repo.ui.verbose: + repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) + def revert(ui, repo, ctx, parents, *pats, **opts): parent, p2 = parents node = ctx.node()
--- a/mercurial/commands.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/commands.py Thu Feb 28 14:51:59 2013 +0100 @@ -456,14 +456,11 @@ wlock = repo.wlock() try: branch = repo.dirstate.branch() + bheads = repo.branchheads(branch) hg.clean(repo, node, show_stats=False) repo.dirstate.setbranch(branch) - revert_opts = opts.copy() - revert_opts['date'] = None - revert_opts['all'] = True - revert_opts['rev'] = hex(parent) - revert_opts['no_backup'] = None - revert(ui, repo, **revert_opts) + rctx = scmutil.revsingle(repo, hex(parent)) + cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) if not opts.get('merge') and op1 != node: try: ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) @@ -471,13 +468,18 @@ finally: ui.setconfig('ui', 'forcemerge', '') - commit_opts = opts.copy() - commit_opts['addremove'] = False - if not commit_opts['message'] and not commit_opts['logfile']: + e = cmdutil.commiteditor + if not opts['message'] and not opts['logfile']: # we don't translate commit messages - commit_opts['message'] = "Backed out changeset %s" % short(node) - commit_opts['force_editor'] = True - commit(ui, repo, **commit_opts) + opts['message'] = "Backed out changeset %s" % short(node) + e = cmdutil.commitforceeditor + + def commitfunc(ui, repo, message, match, opts): + return repo.commit(message, opts.get('user'), opts.get('date'), + match, editor=e) + newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) + cmdutil.commitstatus(repo, newnode, branch, bheads) + def nice(node): return '%d:%s' % (repo.changelog.rev(node), short(node)) ui.status(_('changeset %s backs out changeset %s\n') % @@ -1361,50 +1363,7 @@ ui.status(_("nothing changed\n")) return 1 - ctx = repo[node] - parents = ctx.parents() - - if (not opts.get('amend') and bheads and node not in bheads and not - [x for x in parents if x.node() in bheads and x.branch() == branch]): - ui.status(_('created new head\n')) - # The message is not printed for initial roots. For the other - # changesets, it is printed in the following situations: - # - # Par column: for the 2 parents with ... - # N: null or no parent - # B: parent is on another named branch - # C: parent is a regular non head changeset - # H: parent was a branch head of the current branch - # Msg column: whether we print "created new head" message - # In the following, it is assumed that there already exists some - # initial branch heads of the current branch, otherwise nothing is - # printed anyway. - # - # Par Msg Comment - # N N y additional topo root - # - # B N y additional branch root - # C N y additional topo head - # H N n usual case - # - # B B y weird additional branch root - # C B y branch merge - # H B n merge with named branch - # - # C C y additional head from merge - # C H n merge with a head - # - # H H n head merge: head count decreases - - if not opts.get('close_branch'): - for r in parents: - if r.closesbranch() and r.branch() == branch: - ui.status(_('reopening closed branch head %d\n') % r) - - if ui.debugflag: - ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) - elif ui.verbose: - ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) + cmdutil.commitstatus(repo, node, branch, bheads, opts) @command('copy|cp', [('A', 'after', None, _('record a copy that has already occurred')), @@ -3814,7 +3773,6 @@ def checkexact(repo, n, nodeid): if opts.get('exact') and hex(n) != nodeid: - repo.rollback() raise util.Abort(_('patch is damaged or loses information')) def tryone(ui, hunk, parents): @@ -4257,10 +4215,10 @@ displayer.show(ctx, copies=copies, matchfn=revmatchfn) for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): + if displayer.flush(ctx.rev()): + count += 1 if count == limit: break - if displayer.flush(ctx.rev()): - count += 1 displayer.close() @command('manifest', @@ -5577,12 +5535,11 @@ # i18n: column positioning for "hg summary" ui.write(_('bookmarks:'), label='log.bookmark') if current is not None: - try: - marks.remove(current) + if current in marks: ui.write(' *' + current, label='bookmarks.current') - except ValueError: - # current bookmark not in parent ctx marks - pass + marks.remove(current) + else: + ui.write(' [%s]' % current, label='bookmarks.current') for m in marks: ui.write(' ' + m, label='log.bookmark') ui.write('\n', label='log.bookmark')
--- a/mercurial/context.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/context.py Thu Feb 28 14:51:59 2013 +0100 @@ -426,12 +426,12 @@ # repository is filtered this may lead to `filectx` trying to build # `changectx` for filtered revision. In such case we fallback to # creating `changectx` on the unfiltered version of the reposition. - # This fallback should not be an issue because`changectx` from - # `filectx` are not used in complexe operation that care about + # This fallback should not be an issue because `changectx` from + # `filectx` are not used in complex operations that care about # filtering. # # This fallback is a cheap and dirty fix that prevent several - # crash. It does not ensure the behavior is correct. However the + # crashes. It does not ensure the behavior is correct. However the # behavior was not correct before filtering either and "incorrect # behavior" is seen as better as "crash" # @@ -1138,6 +1138,22 @@ finally: wlock.release() + def markcommitted(self, node): + """Perform post-commit cleanup necessary after commiting this workingctx + + Specifically, this updates backing stores this working context + wraps to reflect the fact that the changes reflected by this + workingctx have been committed. For example, it marks + modified and added files as normal in the dirstate. + + """ + + for f in self.modified() + self.added(): + self._repo.dirstate.normal(f) + for f in self.removed(): + self._repo.dirstate.drop(f) + self._repo.dirstate.setparents(node) + def dirs(self): return set(self._repo.dirstate.dirs())
--- a/mercurial/dirstate.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/dirstate.py Thu Feb 28 14:51:59 2013 +0100 @@ -9,10 +9,8 @@ from node import nullid from i18n import _ import scmutil, util, ignore, osutil, parsers, encoding -import struct, os, stat, errno -import cStringIO +import os, stat, errno, gc -_format = ">cllll" propertycache = util.propertycache filecache = scmutil.filecache _rangemask = 0x7fffffff @@ -287,7 +285,23 @@ if not st: return - p = parsers.parse_dirstate(self._map, self._copymap, st) + # Python's garbage collector triggers a GC each time a certain number + # of container objects (the number being defined by + # gc.get_threshold()) are allocated. parse_dirstate creates a tuple + # for each file in the dirstate. The C version then immediately marks + # them as not to be tracked by the collector. However, this has no + # effect on when GCs are triggered, only on what objects the GC looks + # into. This means that O(number of files) GCs are unavoidable. + # Depending on when in the process's lifetime the dirstate is parsed, + # this can get very expensive. As a workaround, disable GC while + # parsing the dirstate. + gcenabled = gc.isenabled() + gc.disable() + try: + p = parsers.parse_dirstate(self._map, self._copymap, st) + finally: + if gcenabled: + gc.enable() if not self._dirtypl: self._pl = p @@ -508,38 +522,7 @@ # use the modification time of the newly created temporary file as the # filesystem's notion of 'now' now = util.fstat(st).st_mtime - copymap = self._copymap - try: - finish(parsers.pack_dirstate(self._map, copymap, self._pl, now)) - return - except AttributeError: - pass - - now = int(now) - cs = cStringIO.StringIO() - pack = struct.pack - write = cs.write - write("".join(self._pl)) - for f, e in self._map.iteritems(): - if e[0] == 'n' and e[3] == now: - # The file was last modified "simultaneously" with the current - # write to dirstate (i.e. within the same second for file- - # systems with a granularity of 1 sec). This commonly happens - # for at least a couple of files on 'update'. - # The user could change the file without changing its size - # within the same second. Invalidate the file's stat data in - # dirstate, forcing future 'status' calls to compare the - # contents of the file. This prevents mistakenly treating such - # files as clean. - e = (e[0], 0, -1, -1) # mark entry as 'unset' - self._map[f] = e - - if f in copymap: - f = "%s\0%s" % (f, copymap[f]) - e = pack(_format, e[0], e[1], e[2], e[3], len(f)) - write(e) - write(f) - finish(cs.getvalue()) + finish(parsers.pack_dirstate(self._map, self._copymap, self._pl, now)) def _dirignore(self, f): if f == '.': @@ -710,9 +693,30 @@ # step 3: report unseen items in the dmap hash if not skipstep3 and not exact: visit = sorted([f for f in dmap if f not in results and matchfn(f)]) - nf = iter(visit).next - for st in util.statfiles([join(i) for i in visit]): - results[nf()] = st + if unknown: + # unknown == True means we walked the full directory tree above. + # So if a file is not seen it was either a) not matching matchfn + # b) ignored, c) missing, or d) under a symlink directory. + audit_path = scmutil.pathauditor(self._root) + + for nf in iter(visit): + # Report ignored items in the dmap as long as they are not + # under a symlink directory. + if ignore(nf) and audit_path.check(nf): + try: + results[nf] = lstat(join(nf)) + except OSError: + # file doesn't exist + results[nf] = None + else: + # It's either missing or under a symlink directory + results[nf] = None + else: + # We may not have walked the full directory tree above, + # so stat everything we missed. + nf = iter(visit).next + for st in util.statfiles([join(i) for i in visit]): + results[nf()] = st for s in subrepos: del results[s] del results['.hg']
--- a/mercurial/dispatch.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/dispatch.py Thu Feb 28 14:51:59 2013 +0100 @@ -247,6 +247,7 @@ (_("** Mercurial Distributed SCM (version %s)\n") % myver) + (_("** Extensions loaded: %s\n") % ", ".join([x[0] for x in extensions.extensions()]))) + ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc()) ui.warn(warning) raise @@ -333,7 +334,7 @@ self.cmdname = cmd = args.pop(0) args = map(util.expandpath, args) - for invalidarg in ("--cwd", "-R", "--repository", "--repo"): + for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"): if _earlygetopt([invalidarg], args): def fn(ui, *args): ui.warn(_("error in definition for alias '%s': %s may only " @@ -738,16 +739,23 @@ msg = ' '.join(' ' in a and repr(a) or a for a in fullargs) ui.log("command", msg + "\n") d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) + starttime = time.time() + ret = None try: - return runcommand(lui, repo, cmd, fullargs, ui, options, d, - cmdpats, cmdoptions) + ret = runcommand(lui, repo, cmd, fullargs, ui, options, d, + cmdpats, cmdoptions) + return ret finally: + duration = time.time() - starttime + ui.log("commandfinish", "%s exited %s after %0.2f seconds\n", + cmd, ret, duration) if repo and repo != req.repo: repo.close() def lsprofile(ui, func, fp): format = ui.config('profiling', 'format', default='text') field = ui.config('profiling', 'sort', default='inlinetime') + limit = ui.configint('profiling', 'limit', default=30) climit = ui.configint('profiling', 'nested', default=5) if format not in ['text', 'kcachegrind']: @@ -776,7 +784,7 @@ # format == 'text' stats = lsprof.Stats(p.getstats()) stats.sort(field) - stats.pprint(limit=30, file=fp, climit=climit) + stats.pprint(limit=limit, file=fp, climit=climit) def statprofile(ui, func, fp): try:
--- a/mercurial/extensions.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/extensions.py Thu Feb 28 14:51:59 2013 +0100 @@ -11,7 +11,7 @@ _extensions = {} _order = [] -_ignore = ['hbisect', 'bookmarks', 'parentrevspec'] +_ignore = ['hbisect', 'bookmarks', 'parentrevspec', 'interhg'] def extensions(): for name in _order: @@ -50,7 +50,6 @@ raise def load(ui, name, path): - # unused ui argument kept for backwards compatibility if name.startswith('hgext.') or name.startswith('hgext/'): shortname = name[6:] else:
--- a/mercurial/help/config.txt Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/help/config.txt Thu Feb 28 14:51:59 2013 +0100 @@ -996,10 +996,13 @@ ``inlinetime``. Default: inlinetime. +``limit`` + Number of lines to show. Specific to the ``ls`` instrumenting profiler. + Default: 30. + ``nested`` - Show at most this number of lines of drill-down info in a tree structure - after each main entry. This can help explain the difference between Total - and Inline. + Show at most this number of lines of drill-down info after each main entry. + This can help explain the difference between Total and Inline. Specific to the ``ls`` instrumenting profiler. Default: 5. @@ -1459,3 +1462,48 @@ ``templates`` Where to find the HTML templates. Default is install path. + +``websub`` +---------- + +Web substitution filter definition. You can use this section to +define a set of regular expression substitution patterns which +let you automatically modify the hgweb server output. + +The default hgweb templates only apply these substitution patterns +on the revision description fields. You can apply them anywhere +you want when you create your own templates by adding calls to the +"websub" filter (usually after calling the "escape" filter). + +This can be used, for example, to convert issue references to links +to your issue tracker, or to convert "markdown-like" syntax into +HTML (see the examples below). + +Each entry in this section names a substitution filter. +The value of each entry defines the substitution expression itself. +The websub expressions follow the old interhg extension syntax, +which in turn imitates the Unix sed replacement syntax:: + + pattername = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] + +You can use any separator other than "/". The final "i" is optional +and indicates that the search must be case insensitive. + +Examples:: + + [websub] + issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i + italic = s/\b_(\S+)_\b/<i>\1<\/i>/ + bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/ + +``worker`` +---------- + +Parallel master/worker configuration. We currently perform working +directory updates in parallel on Unix-like systems, which greatly +helps performance. + +``numcpus`` + Number of CPUs to use for parallel operations. Default is 4 or the + number of CPUs on the system, whichever is larger. A zero or + negative value is treated as ``use the default``.
--- a/mercurial/help/dates.txt Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/help/dates.txt Thu Feb 28 14:51:59 2013 +0100 @@ -18,6 +18,9 @@ - ``12-6`` - ``12/6`` - ``12/6/6`` (Dec 6 2006) +- ``today`` (midnight) +- ``yesterday`` (midnight) +- ``now`` - right now Lastly, there is Mercurial's internal format:
--- a/mercurial/help/templates.txt Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/help/templates.txt Thu Feb 28 14:51:59 2013 +0100 @@ -44,19 +44,21 @@ In addition to filters, there are some basic built-in functions: +- date(date[, fmt]) + +- fill(text[, width]) + +- get(dict, key) + - if(expr, then[, else]) - ifeq(expr, expr, then[, else]) -- sub(pat, repl, expr) - - join(list, sep) - label(label, expr) -- date(date[, fmt]) - -- fill(text[, width]) +- sub(pat, repl, expr) Also, for any expression that returns a list, there is a list operator:
--- a/mercurial/hgweb/common.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/hgweb/common.py Thu Feb 28 14:51:59 2013 +0100 @@ -129,7 +129,7 @@ for part in parts: if (part in ('', os.curdir, os.pardir) or os.sep in part or os.altsep is not None and os.altsep in part): - return "" + return fpath = os.path.join(*parts) if isinstance(directory, str): directory = [directory] @@ -144,7 +144,6 @@ data = fp.read() fp.close() req.respond(HTTP_OK, ct, body=data) - return "" except TypeError: raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') except OSError, err:
--- a/mercurial/hgweb/hgweb_mod.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/hgweb/hgweb_mod.py Thu Feb 28 14:51:59 2013 +0100 @@ -8,11 +8,13 @@ import os from mercurial import ui, hg, hook, error, encoding, templater, util, repoview +from mercurial.templatefilters import websub +from mercurial.i18n import _ from common import get_stat, ErrorResponse, permhooks, caching from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST from common import HTTP_NOT_FOUND, HTTP_SERVER_ERROR from request import wsgirequest -import webcommands, protocol, webutil +import webcommands, protocol, webutil, re perms = { 'changegroup': 'pull', @@ -73,6 +75,7 @@ # a repo owner may set web.templates in .hg/hgrc to get any file # readable by the user running the CGI script self.templatepath = self.config('web', 'templates') + self.websubtable = self.loadwebsub() # The CGI scripts are often run by a user different from the repo owner. # Trust the settings from the .hg/hgrc files by default. @@ -258,6 +261,47 @@ return [''] return tmpl('error', error=inst.message) + def loadwebsub(self): + websubtable = [] + websubdefs = self.repo.ui.configitems('websub') + # we must maintain interhg backwards compatibility + websubdefs += self.repo.ui.configitems('interhg') + for key, pattern in websubdefs: + # grab the delimiter from the character after the "s" + unesc = pattern[1] + delim = re.escape(unesc) + + # identify portions of the pattern, taking care to avoid escaped + # delimiters. the replace format and flags are optional, but + # delimiters are required. + match = re.match( + r'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$' + % (delim, delim, delim), pattern) + if not match: + self.repo.ui.warn(_("websub: invalid pattern for %s: %s\n") + % (key, pattern)) + continue + + # we need to unescape the delimiter for regexp and format + delim_re = re.compile(r'(?<!\\)\\%s' % delim) + regexp = delim_re.sub(unesc, match.group(1)) + format = delim_re.sub(unesc, match.group(2)) + + # the pattern allows for 6 regexp flags, so set them if necessary + flagin = match.group(3) + flags = 0 + if flagin: + for flag in flagin.upper(): + flags |= re.__dict__[flag] + + try: + regexp = re.compile(regexp, flags) + websubtable.append((regexp, format)) + except re.error: + self.repo.ui.warn(_("websub: invalid regexp for %s: %s\n") + % (key, regexp)) + return websubtable + def templater(self, req): # determine scheme, port and server name @@ -311,9 +355,13 @@ or req.env.get('REPO_NAME') or req.url.strip('/') or self.repo.root) + def websubfilter(text): + return websub(text, self.websubtable) + # create the templater tmpl = templater.templater(mapfile, + filters={"websub": websubfilter}, defaults={"url": req.url, "logourl": logourl, "logoimg": logoimg,
--- a/mercurial/hgweb/hgwebdir_mod.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/hgweb/hgwebdir_mod.py Thu Feb 28 14:51:59 2013 +0100 @@ -197,7 +197,8 @@ if isinstance(tp, str): tp = [tp] static = [os.path.join(p, 'static') for p in tp] - return (staticfile(static, fname, req),) + staticfile(static, fname, req) + return [] # top-level index elif not virtual:
--- a/mercurial/hgweb/webcommands.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/hgweb/webcommands.py Thu Feb 28 14:51:59 2013 +0100 @@ -89,6 +89,7 @@ author=fctx.user(), date=fctx.date(), desc=fctx.description(), + extra=fctx.extra(), branch=webutil.nodebranchnodefault(fctx), parent=webutil.parents(fctx), child=webutil.children(fctx), @@ -162,6 +163,7 @@ child=webutil.children(ctx), changelogtag=showtags, desc=ctx.description(), + extra=ctx.extra(), date=ctx.date(), files=files, rev=ctx.rev(), @@ -216,6 +218,7 @@ "child": webutil.children(ctx, i + 1), "changelogtag": showtags, "desc": ctx.description(), + "extra": ctx.extra(), "date": ctx.date(), "files": files, "rev": i, @@ -299,6 +302,7 @@ changesetbranch=showbranch, author=ctx.user(), desc=ctx.description(), + extra=ctx.extra(), date=ctx.date(), files=files, diffsummary=lambda **x: webutil.diffsummary(diffstatgen), @@ -531,6 +535,7 @@ parity=parity.next(), author=ctx.user(), desc=ctx.description(), + extra=ctx.extra(), date=ctx.date(), rev=i, node=hn, @@ -590,6 +595,7 @@ rev=ctx.rev(), date=ctx.date(), desc=ctx.description(), + extra=ctx.extra(), author=ctx.user(), rename=rename, branch=webutil.nodebranchnodefault(ctx), @@ -651,6 +657,7 @@ rev=ctx.rev(), date=ctx.date(), desc=ctx.description(), + extra=ctx.extra(), author=ctx.user(), rename=rename, branch=webutil.nodebranchnodefault(ctx), @@ -689,6 +696,7 @@ "rev": f.rev(), "author": f.user(), "desc": f.description(), + "extra": f.extra(), "file": f.path(), "targetline": targetline, "line": l, @@ -705,6 +713,7 @@ author=fctx.user(), date=fctx.date(), desc=fctx.description(), + extra=fctx.extra(), rename=webutil.renamelink(fctx), branch=webutil.nodebranchnodefault(fctx), parent=webutil.parents(fctx), @@ -770,6 +779,7 @@ "parent": webutil.parents(iterfctx), "child": webutil.children(iterfctx), "desc": iterfctx.description(), + "extra": iterfctx.extra(), "tags": webutil.nodetagsdict(repo, iterfctx.node()), "bookmarks": webutil.nodebookmarksdict( repo, iterfctx.node()), @@ -832,7 +842,8 @@ if isinstance(tp, str): tp = [tp] static = [os.path.join(p, 'static') for p in tp] - return [staticfile(static, fname, req)] + staticfile(static, fname, req) + return [] def graph(web, req, tmpl):
--- a/mercurial/hook.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/hook.py Thu Feb 28 14:51:59 2013 +0100 @@ -6,7 +6,7 @@ # GNU General Public License version 2 or any later version. from i18n import _ -import os, sys +import os, sys, time, types import extensions, util, demandimport def _pythonhook(ui, repo, name, hname, funcname, args, throw): @@ -20,6 +20,8 @@ be run as hooks without wrappers to convert return values.''' ui.note(_("calling hook %s: %s\n") % (hname, funcname)) + starttime = time.time() + obj = funcname if not util.safehasattr(obj, '__call__'): d = funcname.rfind('.') @@ -92,6 +94,12 @@ return True finally: sys.stdout, sys.stderr, sys.stdin = old + duration = time.time() - starttime + readablefunc = funcname + if isinstance(funcname, types.FunctionType): + readablefunc = funcname.__module__ + "." + funcname.__name__ + ui.log('pythonhook', 'pythonhook-%s: %s finished in %0.2f seconds\n', + name, readablefunc, duration) if r: if throw: raise util.Abort(_('%s hook failed') % hname) @@ -101,6 +109,7 @@ def _exthook(ui, repo, name, cmd, args, throw): ui.note(_("running hook %s: %s\n") % (name, cmd)) + starttime = time.time() env = {} for k, v in args.iteritems(): if util.safehasattr(v, '__call__'): @@ -121,6 +130,10 @@ r = util.system(cmd, environ=env, cwd=cwd, out=ui) else: r = util.system(cmd, environ=env, cwd=cwd, out=ui.fout) + + duration = time.time() - starttime + ui.log('exthook', 'exthook-%s: %s finished in %0.2f seconds\n', + name, cmd, duration) if r: desc, r = util.explainexit(r) if throw:
--- a/mercurial/httppeer.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/httppeer.py Thu Feb 28 14:51:59 2013 +0100 @@ -145,13 +145,14 @@ raise error.OutOfBandError(resp.read()) # accept old "text/plain" and "application/hg-changegroup" for now if not (proto.startswith('application/mercurial-') or - proto.startswith('text/plain') or + (proto.startswith('text/plain') + and not resp.headers.get('content-length')) or proto.startswith('application/hg-changegroup')): self.ui.debug("requested URL: '%s'\n" % util.hidepassword(cu)) raise error.RepoError( _("'%s' does not appear to be an hg repository:\n" "---%%<--- (%s)\n%s\n---%%<---\n") - % (safeurl, proto or 'no content-type', resp.read())) + % (safeurl, proto or 'no content-type', resp.read(1024))) if proto.startswith('application/mercurial-'): try:
--- a/mercurial/localrepo.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/localrepo.py Thu Feb 28 14:51:59 2013 +0100 @@ -49,7 +49,7 @@ def hasunfilteredcache(repo, name): - """check if an repo and a unfilteredproperty cached value for <name>""" + """check if a repo has an unfilteredpropertycache value for <name>""" return name in vars(repo.unfiltered()) def unfilteredmethod(orig): @@ -310,13 +310,13 @@ def unfiltered(self): """Return unfiltered version of the repository - Intended to be ovewritten by filtered repo.""" + Intended to be overwritten by filtered repo.""" return self def filtered(self, name): """Return a filtered version of a repository""" # build a new class with the mixin and the current class - # (possibily subclass of the repo) + # (possibly subclass of the repo) class proxycls(repoview.repoview, self.unfiltered().__class__): pass return proxycls(self, name) @@ -962,7 +962,7 @@ delattr(self.unfiltered(), 'dirstate') def invalidate(self): - unfiltered = self.unfiltered() # all filecaches are stored on unfiltered + unfiltered = self.unfiltered() # all file caches are stored unfiltered for k in self._filecache: # dirstate is invalidated separately in invalidatedirstate() if k == 'dirstate': @@ -1230,12 +1230,14 @@ elif f not in self.dirstate: fail(f, _("file not tracked!")) + cctx = context.workingctx(self, text, user, date, extra, changes) + if (not force and not extra.get("close") and not merge - and not (changes[0] or changes[1] or changes[2]) + and not cctx.files() and wctx.branch() == wctx.p1().branch()): return None - if merge and changes[3]: + if merge and cctx.deleted(): raise util.Abort(_("cannot commit merge with missing files")) ms = mergemod.mergestate(self) @@ -1244,7 +1246,6 @@ raise util.Abort(_("unresolved merge conflicts " "(see hg help resolve)")) - cctx = context.workingctx(self, text, user, date, extra, changes) if editor: cctx._text = editor(self, cctx, subs) edited = (text != cctx._text) @@ -1278,11 +1279,7 @@ # update bookmarks, dirstate and mergestate bookmarks.update(self, [p1, p2], ret) - for f in changes[0] + changes[1]: - self.dirstate.normal(f) - for f in changes[2]: - self.dirstate.drop(f) - self.dirstate.setparents(ret) + cctx.markcommitted(ret) ms.reset() finally: wlock.release() @@ -1397,12 +1394,6 @@ '''Inform the repository that nodes have been destroyed. Intended for use by strip and rollback, so there's a common place for anything that has to be done after destroying history. - - If you know the branchheadcache was uptodate before nodes were removed - and you also know the set of candidate new heads that may have resulted - from the destruction, you can set newheadnodes. This will enable the - code to update the branchheads cache, rather than having future code - decide it's invalid and regenerating it from scratch. ''' # When one tries to: # 1) destroy nodes thus calling this method (e.g. strip) @@ -1417,7 +1408,7 @@ self._phasecache.write() # update the 'served' branch cache to help read only server process - # Thanks to branchcach collaboration this is done from the nearest + # Thanks to branchcache collaboration this is done from the nearest # filtered subset and it is expected to be fast. branchmap.updatecache(self.filtered('served')) @@ -1541,12 +1532,12 @@ modified, added, clean = [], [], [] withflags = mf1.withflags() | mf2.withflags() - for fn in mf2: + for fn, mf2node in mf2.iteritems(): if fn in mf1: if (fn not in deleted and ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or - (mf1[fn] != mf2[fn] and - (mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))): + (mf1[fn] != mf2node and + (mf2node or ctx1[fn].cmp(ctx2[fn]))))): modified.append(fn) elif listclean: clean.append(fn) @@ -2408,6 +2399,12 @@ for n in added: self.hook("incoming", node=hex(n), source=srctype, url=url) + + newheads = [h for h in self.heads() if h not in oldheads] + self.ui.log("incoming", + "%s incoming changes - new heads: %s\n", + len(added), + ', '.join([hex(c[:6]) for c in newheads])) self._afterlock(runhooks) finally:
--- a/mercurial/lsprof.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/lsprof.py Thu Feb 28 14:51:59 2013 +0100 @@ -50,9 +50,9 @@ ccount = 0 if climit and e.calls: for se in e.calls: - file.write(cols % ("+%s" % se.callcount, se.reccallcount, + file.write(cols % (se.callcount, se.reccallcount, se.totaltime, se.inlinetime, - "+%s" % label(se.code))) + " %s" % label(se.code))) count += 1 ccount += 1 if limit is not None and count == limit:
--- a/mercurial/manifest.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/manifest.py Thu Feb 28 14:51:59 2013 +0100 @@ -28,7 +28,8 @@ class manifest(revlog.revlog): def __init__(self, opener): - self._mancache = None + # we expect to deal with not more than three revs at a time in merge + self._mancache = util.lrucachedict(3) revlog.revlog.__init__(self, opener, "00manifest.i") def parse(self, lines): @@ -51,12 +52,12 @@ def read(self, node): if node == revlog.nullid: return manifestdict() # don't upset local cache - if self._mancache and self._mancache[0] == node: - return self._mancache[1] + if node in self._mancache: + return self._mancache[node][0] text = self.revision(node) arraytext = array.array('c', text) mapping = self.parse(text) - self._mancache = (node, mapping, arraytext) + self._mancache[node] = (mapping, arraytext) return mapping def _search(self, m, s, lo=0, hi=None): @@ -102,8 +103,9 @@ def find(self, node, f): '''look up entry for a single file efficiently. return (node, flags) pair if found, (None, None) if not.''' - if self._mancache and self._mancache[0] == node: - return self._mancache[1].get(f), self._mancache[1].flags(f) + if node in self._mancache: + mapping = self._mancache[node][0] + return mapping.get(f), mapping.flags(f) text = self.revision(node) start, end = self._search(text, f) if start == end: @@ -143,7 +145,7 @@ # if we're using the cache, make sure it is valid and # parented by the same node we're diffing against - if not (changed and self._mancache and p1 and self._mancache[0] == p1): + if not (changed and p1 and (p1 in self._mancache)): files = sorted(map) checkforbidden(files) @@ -156,7 +158,7 @@ cachedelta = None else: added, removed = changed - addlist = self._mancache[2] + addlist = self._mancache[p1][1] checkforbidden(added) # combine the changed lists into one list for sorting @@ -208,6 +210,6 @@ text = util.buffer(arraytext) n = self.addrevision(text, transaction, link, p1, p2, cachedelta) - self._mancache = (n, map, arraytext) + self._mancache[n] = (map, arraytext) return n
--- a/mercurial/match.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/match.py Thu Feb 28 14:51:59 2013 +0100 @@ -62,6 +62,7 @@ self._files = [] self._anypats = bool(include or exclude) self._ctx = ctx + self._always = False if include: pats = _normalize(include, 'glob', root, cwd, auditor) @@ -103,6 +104,7 @@ m = lambda f: not em(f) else: m = lambda f: True + self._always = True self.matchfn = m self._fmap = set(self._files) @@ -130,7 +132,7 @@ def anypats(self): return self._anypats def always(self): - return False + return self._always class exact(match): def __init__(self, root, cwd, files): @@ -139,8 +141,7 @@ class always(match): def __init__(self, root, cwd): match.__init__(self, root, cwd, []) - def always(self): - return True + self._always = True class narrowmatcher(match): """Adapt a matcher to work on a subdirectory only. @@ -175,6 +176,7 @@ self._cwd = matcher._cwd self._path = path self._matcher = matcher + self._always = matcher._always self._files = [f[len(path) + 1:] for f in matcher._files if f.startswith(path + "/")]
--- a/mercurial/merge.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/merge.py Thu Feb 28 14:51:59 2013 +0100 @@ -7,7 +7,7 @@ from node import nullid, nullrev, hex, bin from i18n import _ -import error, util, filemerge, copies, subrepo +import error, util, filemerge, copies, subrepo, worker import errno, os, shutil class mergestate(object): @@ -176,62 +176,67 @@ state = branchmerge and 'r' or 'f' for f in wctx.deleted(): if f not in mctx: - actions.append((f, state)) + actions.append((f, state, None, "forget deleted")) if not branchmerge: for f in wctx.removed(): if f not in mctx: - actions.append((f, "f")) + actions.append((f, "f", None, "forget removed")) return actions -def manifestmerge(repo, p1, p2, pa, overwrite, partial): +def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial): """ Merge p1 and p2 with ancestor pa and generate merge action list - overwrite = whether we clobber working files + branchmerge and force are as passed in to update partial = function to filter file lists """ - def act(msg, m, f, *args): - repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) - actions.append((f, m) + args) - + overwrite = force and not branchmerge actions, copy, movewithdir = [], {}, {} + followcopies = False if overwrite: - pa = p1 + pa = wctx elif pa == p2: # backwards - pa = p1.p1() + pa = wctx.p1() + elif not branchmerge and not wctx.dirty(missing=True): + pass elif pa and repo.ui.configbool("merge", "followcopies", True): - ret = copies.mergecopies(repo, p1, p2, pa) + followcopies = True + + # manifests fetched in order are going to be faster, so prime the caches + [x.manifest() for x in + sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev())] + + if followcopies: + ret = copies.mergecopies(repo, wctx, p2, pa) copy, movewithdir, diverge, renamedelete = ret for of, fl in diverge.iteritems(): - act("divergent renames", "dr", of, fl) + actions.append((of, "dr", (fl,), "divergent renames")) for of, fl in renamedelete.iteritems(): - act("rename and delete", "rd", of, fl) + actions.append((of, "rd", (fl,), "rename and delete")) repo.ui.note(_("resolving manifests\n")) - repo.ui.debug(" overwrite: %s, partial: %s\n" - % (bool(overwrite), bool(partial))) - repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, p1, p2)) + repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n" + % (bool(branchmerge), bool(force), bool(partial))) + repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2)) - m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() + m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() copied = set(copy.values()) copied.update(movewithdir.values()) if '.hgsubstate' in m1: # check whether sub state is modified - for s in sorted(p1.substate): - if p1.sub(s).dirty(): + for s in sorted(wctx.substate): + if wctx.sub(s).dirty(): m1['.hgsubstate'] += "+" break + aborts, prompts = [], [] # Compare manifests - visit = m1.iteritems() - if repo.ui.debugflag: - visit = sorted(visit) - for f, n in visit: + for f, n in m1.iteritems(): if partial and not partial(f): continue if f in m2: @@ -245,77 +250,142 @@ pass # remote unchanged - keep local elif n == a and fl1 == fla: # local unchanged - use remote if n == n2: # optimization: keep local content - act("update permissions", "e", f, fl2) + actions.append((f, "e", (fl2,), "update permissions")) else: - act("remote is newer", "g", f, fl2) + actions.append((f, "g", (fl2,), "remote is newer")) elif nol and n2 == a: # remote only changed 'x' - act("update permissions", "e", f, fl2) + actions.append((f, "e", (fl2,), "update permissions")) elif nol and n == a: # local only changed 'x' - act("remote is newer", "g", f, fl1) + actions.append((f, "g", (fl1,), "remote is newer")) else: # both changed something - act("versions differ", "m", f, f, f, False) + actions.append((f, "m", (f, f, False), "versions differ")) elif f in copied: # files we'll deal with on m2 side pass elif f in movewithdir: # directory rename f2 = movewithdir[f] - act("remote renamed directory to " + f2, "d", f, None, f2, - m1.flags(f)) + actions.append((f, "d", (None, f2, m1.flags(f)), + "remote renamed directory to " + f2)) elif f in copy: f2 = copy[f] - act("local copied/moved to " + f2, "m", f, f2, f, False) + actions.append((f, "m", (f2, f, False), + "local copied/moved to " + f2)) elif f in ma: # clean, a different, no remote if n != ma[f]: - if repo.ui.promptchoice( - _(" local changed %s which remote deleted\n" - "use (c)hanged version or (d)elete?") % f, - (_("&Changed"), _("&Delete")), 0): - act("prompt delete", "r", f) - else: - act("prompt keep", "a", f) + prompts.append((f, "cd")) # prompt changed/deleted elif n[20:] == "a": # added, no remote - act("remote deleted", "f", f) + actions.append((f, "f", None, "remote deleted")) else: - act("other deleted", "r", f) + actions.append((f, "r", None, "other deleted")) - visit = m2.iteritems() - if repo.ui.debugflag: - visit = sorted(visit) - for f, n in visit: + for f, n in m2.iteritems(): if partial and not partial(f): continue if f in m1 or f in copied: # files already visited continue if f in movewithdir: f2 = movewithdir[f] - act("local renamed directory to " + f2, "d", None, f, f2, - m2.flags(f)) + actions.append((None, "d", (f, f2, m2.flags(f)), + "local renamed directory to " + f2)) elif f in copy: f2 = copy[f] if f2 in m2: - act("remote copied to " + f, "m", - f2, f, f, False) + actions.append((f2, "m", (f, f, False), + "remote copied to " + f)) else: - act("remote moved to " + f, "m", - f2, f, f, True) + actions.append((f2, "m", (f, f, True), + "remote moved to " + f)) elif f not in ma: - if (not overwrite - and _checkunknownfile(repo, p1, p2, f)): - act("remote differs from untracked local", - "m", f, f, f, False) + # local unknown, remote created: the logic is described by the + # following table: + # + # force branchmerge different | action + # n * n | get + # n * y | abort + # y n * | get + # y y n | get + # y y y | merge + # + # Checking whether the files are different is expensive, so we + # don't do that when we can avoid it. + if force and not branchmerge: + actions.append((f, "g", (m2.flags(f),), "remote created")) else: - act("remote created", "g", f, m2.flags(f)) + different = _checkunknownfile(repo, wctx, p2, f) + if force and branchmerge and different: + actions.append((f, "m", (f, f, False), + "remote differs from untracked local")) + elif not force and different: + aborts.append((f, "ud")) + else: + actions.append((f, "g", (m2.flags(f),), "remote created")) elif n != ma[f]: + prompts.append((f, "dc")) # prompt deleted/changed + + for f, m in sorted(aborts): + if m == "ud": + repo.ui.warn(_("%s: untracked file differs\n") % f) + else: assert False, m + if aborts: + raise util.Abort(_("untracked files in working directory differ " + "from files in requested revision")) + + for f, m in sorted(prompts): + if m == "cd": + if repo.ui.promptchoice( + _("local changed %s which remote deleted\n" + "use (c)hanged version or (d)elete?") % f, + (_("&Changed"), _("&Delete")), 0): + actions.append((f, "r", None, "prompt delete")) + else: + actions.append((f, "a", None, "prompt keep")) + elif m == "dc": if repo.ui.promptchoice( _("remote changed %s which local deleted\n" "use (c)hanged version or leave (d)eleted?") % f, (_("&Changed"), _("&Deleted")), 0) == 0: - act("prompt recreating", "g", f, m2.flags(f)) - + actions.append((f, "g", (m2.flags(f),), "prompt recreating")) + else: assert False, m return actions def actionkey(a): return a[1] == "r" and -1 or 0, a +def getremove(repo, mctx, overwrite, args): + """apply usually-non-interactive updates to the working directory + + mctx is the context to be merged into the working copy + + yields tuples for progress updates + """ + verbose = repo.ui.verbose + unlink = util.unlinkpath + wjoin = repo.wjoin + fctx = mctx.filectx + wwrite = repo.wwrite + audit = repo.wopener.audit + i = 0 + for arg in args: + f = arg[0] + if arg[1] == 'r': + if verbose: + repo.ui.note(_("removing %s\n") % f) + audit(f) + try: + unlink(wjoin(f), ignoremissing=True) + except OSError, inst: + repo.ui.warn(_("update failed to remove %s: %s!\n") % + (f, inst.strerror)) + else: + if verbose: + repo.ui.note(_("getting %s\n") % f) + wwrite(f, fctx(f).data(), arg[2][0]) + if i == 100: + yield i, f + i = 0 + i += 1 + if i > 0: + yield i, f + def applyupdates(repo, actions, wctx, mctx, actx, overwrite): """apply the merge action list to the working directory @@ -335,12 +405,13 @@ # prescan for merges for a in actions: - f, m = a[:2] + f, m, args, msg = a + repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) if m == "m": # merge - f2, fd, move = a[2:] + f2, fd, move = args if fd == '.hgsubstate': # merged internally continue - repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd)) + repo.ui.debug(" preserving %s for resolve of %s\n" % (f, fd)) fcl = wctx[f] fco = mctx[f2] if mctx == actx: # backwards, use working dir parent as ancestor @@ -366,27 +437,39 @@ util.unlinkpath(repo.wjoin(f)) numupdates = len(actions) - for i, a in enumerate(actions): - f, m = a[:2] - repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates, + workeractions = [a for a in actions if a[1] in 'gr'] + updated = len([a for a in workeractions if a[1] == 'g']) + removed = len([a for a in workeractions if a[1] == 'r']) + actions = [a for a in actions if a[1] not in 'gr'] + + hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate'] + if hgsub and hgsub[0] == 'r': + subrepo.submerge(repo, wctx, mctx, wctx, overwrite) + + z = 0 + prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), + workeractions) + for i, item in prog: + z += i + repo.ui.progress(_('updating'), z, item=item, total=numupdates, unit=_('files')) - if m == "r": # remove - repo.ui.note(_("removing %s\n") % f) - audit(f) - if f == '.hgsubstate': # subrepo states need updating - subrepo.submerge(repo, wctx, mctx, wctx, overwrite) - try: - util.unlinkpath(repo.wjoin(f), ignoremissing=True) - except OSError, inst: - repo.ui.warn(_("update failed to remove %s: %s!\n") % - (f, inst.strerror)) - removed += 1 - elif m == "m": # merge + + if hgsub and hgsub[0] == 'g': + subrepo.submerge(repo, wctx, mctx, wctx, overwrite) + + _updating = _('updating') + _files = _('files') + progress = repo.ui.progress + + for i, a in enumerate(actions): + f, m, args, msg = a + progress(_updating, z + i + 1, item=f, total=numupdates, unit=_files) + if m == "m": # merge if fd == '.hgsubstate': # subrepo states need updating subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite) continue - f2, fd, move = a[2:] + f2, fd, move = args audit(fd) r = ms.resolve(fd, wctx, mctx) if r is not None and r > 0: @@ -396,15 +479,8 @@ updated += 1 else: merged += 1 - elif m == "g": # get - flags = a[2] - repo.ui.note(_("getting %s\n") % f) - repo.wwrite(f, mctx.filectx(f).data(), flags) - updated += 1 - if f == '.hgsubstate': # subrepo states need updating - subrepo.submerge(repo, wctx, mctx, wctx, overwrite) elif m == "d": # directory rename - f2, fd, flags = a[2:] + f2, fd, flags = args if f: repo.ui.note(_("moving %s to %s\n") % (f, fd)) audit(f) @@ -415,24 +491,24 @@ repo.wwrite(fd, mctx.filectx(f2).data(), flags) updated += 1 elif m == "dr": # divergent renames - fl = a[2] + fl, = args repo.ui.warn(_("note: possible conflict - %s was renamed " "multiple times to:\n") % f) for nf in fl: repo.ui.warn(" %s\n" % nf) elif m == "rd": # rename and delete - fl = a[2] + fl, = args repo.ui.warn(_("note: possible conflict - %s was deleted " "and renamed to:\n") % f) for nf in fl: repo.ui.warn(" %s\n" % nf) elif m == "e": # exec - flags = a[2] + flags, = args audit(f) util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) updated += 1 ms.commit() - repo.ui.progress(_('updating'), None, total=numupdates, unit=_('files')) + progress(_updating, None, total=numupdates, unit=_files) return updated, merged, removed, unresolved @@ -447,21 +523,19 @@ _checkcollision(mctx, None) else: _checkcollision(mctx, (tctx, ancestor)) - if not force: - _checkunknown(repo, tctx, mctx) + actions += manifestmerge(repo, tctx, mctx, + ancestor, + branchmerge, force, + partial) if tctx.rev() is None: actions += _forgetremoved(tctx, mctx, branchmerge) - actions += manifestmerge(repo, tctx, mctx, - ancestor, - force and not branchmerge, - partial) return actions def recordupdates(repo, actions, branchmerge): "record merge actions to the dirstate" for a in actions: - f, m = a[:2] + f, m, args, msg = a if m == "r": # remove if branchmerge: repo.dirstate.remove(f) @@ -480,7 +554,7 @@ else: repo.dirstate.normal(f) elif m == "m": # merge - f2, fd, move = a[2:] + f2, fd, move = args if branchmerge: # We've done a branch merge, mark this file as merged # so that we properly record the merger later @@ -503,7 +577,7 @@ if move: repo.dirstate.drop(f) elif m == "d": # directory rename - f2, fd, flag = a[2:] + f2, fd, flag = args if not f2 and f not in repo.dirstate: # untracked file moved continue
--- a/mercurial/obsolete.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/obsolete.py Thu Feb 28 14:51:59 2013 +0100 @@ -46,7 +46,7 @@ (A, (C, C)) We use a single marker to distinct the "split" case from the "divergence" - case. If two independants operation rewrite the same changeset A in to A' and + case. If two independents operation rewrite the same changeset A in to A' and A'' when have an error case: divergent rewriting. We can detect it because two markers will be created independently: @@ -129,8 +129,9 @@ # # But by transitivity Ad is also a successors of A. To avoid having Ad marked # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>. -# This flag mean that the successors are an interdiff that fix the bumped -# situation, breaking the transitivity of "bumped" here. +# This flag mean that the successors express the changes between the public and +# bumped version and fix the situation, breaking the transitivity of +# "bumped" here. bumpedfix = 1 def _readmarkers(data): @@ -510,7 +511,7 @@ # In such a situation, we arbitrary set the successors sets of # the node to nothing (node pruned) to break the cycle. # - # If no break was encountered we proceeed to phase 2. + # If no break was encountered we proceed to phase 2. # # Phase 2 computes successors sets of CURRENT (case 4); see details # in phase 2 itself. @@ -551,13 +552,13 @@ # successors sets of all its "successors" node. # # Each different marker is a divergence in the obsolescence - # history. It contributes successors sets dictinct from other + # history. It contributes successors sets distinct from other # markers. # # Within a marker, a successor may have divergent successors # sets. In such a case, the marker will contribute multiple # divergent successors sets. If multiple successors have - # divergents successors sets, a cartesian product is used. + # divergent successors sets, a cartesian product is used. # # At the end we post-process successors sets to remove # duplicated entry and successors set that are strict subset of
--- a/mercurial/parsers.c Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/parsers.c Thu Feb 28 14:51:59 2013 +0100 @@ -326,7 +326,8 @@ if (getintat(v, 3, &mtime) == -1) goto bail; if (*s == 'n' && mtime == (uint32_t)now) { - /* See dirstate.py:write for why we do this. */ + /* See pure/parsers.py:pack_dirstate for why we do + * this. */ if (PyDict_SetItem(map, k, dirstate_unset) == -1) goto bail; mode = 0, size = -1, mtime = -1;
--- a/mercurial/pure/parsers.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/pure/parsers.py Thu Feb 28 14:51:59 2013 +0100 @@ -7,7 +7,7 @@ from mercurial.node import bin, nullid from mercurial import util -import struct, zlib +import struct, zlib, cStringIO _pack = struct.pack _unpack = struct.unpack @@ -87,3 +87,29 @@ copymap[f] = c dmap[f] = e[:4] return parents + +def pack_dirstate(dmap, copymap, pl, now): + now = int(now) + cs = cStringIO.StringIO() + write = cs.write + write("".join(pl)) + for f, e in dmap.iteritems(): + if e[0] == 'n' and e[3] == now: + # The file was last modified "simultaneously" with the current + # write to dirstate (i.e. within the same second for file- + # systems with a granularity of 1 sec). This commonly happens + # for at least a couple of files on 'update'. + # The user could change the file without changing its size + # within the same second. Invalidate the file's stat data in + # dirstate, forcing future 'status' calls to compare the + # contents of the file. This prevents mistakenly treating such + # files as clean. + e = (e[0], 0, -1, -1) # mark entry as 'unset' + dmap[f] = e + + if f in copymap: + f = "%s\0%s" % (f, copymap[f]) + e = _pack(">cllll", e[0], e[1], e[2], e[3], len(f)) + write(e) + write(f) + return cs.getvalue()
--- a/mercurial/repoview.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/repoview.py Thu Feb 28 14:51:59 2013 +0100 @@ -149,7 +149,7 @@ repoview.method() --> repo.__class__.method(repoview) The inheritance has to be done dynamically because `repo` can be of any - subclasses of `localrepo`. Eg: `bundlerepo` or `httprepo`. + subclasses of `localrepo`. Eg: `bundlerepo` or `statichttprepo`. """ def __init__(self, repo, filtername): @@ -158,7 +158,7 @@ object.__setattr__(self, '_clcachekey', None) object.__setattr__(self, '_clcache', None) - # not a cacheproperty on purpose we shall implement a proper cache later + # not a propertycache on purpose we shall implement a proper cache later @property def changelog(self): """return a filtered version of the changeset @@ -210,7 +210,7 @@ def __delattr__(self, attr): return delattr(self._unfilteredrepo, attr) - # The `requirement` attribut is initialiazed during __init__. But + # The `requirements` attribute is initialized during __init__. But # __getattr__ won't be called as it also exists on the class. We need # explicit forwarding to main repo here @property
--- a/mercurial/revlog.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/revlog.py Thu Feb 28 14:51:59 2013 +0100 @@ -91,6 +91,14 @@ return bin[1:] raise RevlogError(_("unknown compression type %r") % t) +# index v0: +# 4 bytes: offset +# 4 bytes: compressed length +# 4 bytes: base rev +# 4 bytes: link rev +# 32 bytes: parent 1 nodeid +# 32 bytes: parent 2 nodeid +# 32 bytes: nodeid indexformatv0 = ">4l20s20s20s" v0shaoffset = 56
--- a/mercurial/revset.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/revset.py Thu Feb 28 14:51:59 2013 +0100 @@ -277,20 +277,32 @@ return checkstatus(repo, subset, pat, 1) def ancestor(repo, subset, x): - """``ancestor(single, single)`` - Greatest common ancestor of the two changesets. + """``ancestor(*changeset)`` + Greatest common ancestor of the changesets. + + Accepts 0 or more changesets. + Will return empty list when passed no args. + Greatest common ancestor of a single changeset is that changeset. """ # i18n: "ancestor" is a keyword - l = getargs(x, 2, 2, _("ancestor requires two arguments")) - r = list(repo) - a = getset(repo, r, l[0]) - b = getset(repo, r, l[1]) - if len(a) != 1 or len(b) != 1: - # i18n: "ancestor" is a keyword - raise error.ParseError(_("ancestor arguments must be single revisions")) - an = [repo[a[0]].ancestor(repo[b[0]]).rev()] + l = getlist(x) + rl = list(repo) + anc = None - return [r for r in an if r in subset] + # (getset(repo, rl, i) for i in l) generates a list of lists + rev = repo.changelog.rev + ancestor = repo.changelog.ancestor + node = repo.changelog.node + for revs in (getset(repo, rl, i) for i in l): + for r in revs: + if anc is None: + anc = r + else: + anc = rev(ancestor(node(anc), node(r))) + + if anc is not None and anc in subset: + return [anc] + return [] def _ancestors(repo, subset, x, followfirst=False): args = getset(repo, list(repo), x)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/scmposix.py Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,32 @@ +import sys, os +import osutil + +def _rcfiles(path): + rcs = [os.path.join(path, 'hgrc')] + rcdir = os.path.join(path, 'hgrc.d') + try: + rcs.extend([os.path.join(rcdir, f) + for f, kind in osutil.listdir(rcdir) + if f.endswith(".rc")]) + except OSError: + pass + return rcs + +def systemrcpath(): + path = [] + if sys.platform == 'plan9': + root = 'lib/mercurial' + else: + root = 'etc/mercurial' + # old mod_python does not set sys.argv + if len(getattr(sys, 'argv', [])) > 0: + p = os.path.dirname(os.path.dirname(sys.argv[0])) + path.extend(_rcfiles(os.path.join(p, root))) + path.extend(_rcfiles('/' + root)) + return path + +def userrcpath(): + if sys.platform == 'plan9': + return [os.environ['home'] + '/lib/hgrc'] + else: + return [os.path.expanduser('~/.hgrc')]
--- a/mercurial/scmutil.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/scmutil.py Thu Feb 28 14:51:59 2013 +0100 @@ -9,7 +9,15 @@ from mercurial.node import nullrev import util, error, osutil, revset, similar, encoding, phases import match as matchmod -import os, errno, re, stat, sys, glob +import os, errno, re, stat, glob + +if os.name == 'nt': + import scmwindows as scmplatform +else: + import scmposix as scmplatform + +systemrcpath = scmplatform.systemrcpath +userrcpath = scmplatform.userrcpath def nochangesfound(ui, repo, excluded=None): '''Report no changes for push/pull, excluded is None or a list of @@ -38,6 +46,11 @@ for c in (':', '\0', '\n', '\r'): if c in lbl: raise util.Abort(_("%r cannot be used in a name") % c) + try: + int(lbl) + raise util.Abort(_("a %s cannot have an integer as its name") % kind) + except ValueError: + pass def checkfilename(f): '''Check that the filename f is an acceptable filename for a tracked file''' @@ -179,6 +192,13 @@ # want to add "foo/bar/baz" before checking if there's a "foo/.hg" self.auditeddir.update(prefixes) + def check(self, path): + try: + self(path) + return True + except (OSError, util.Abort): + return False + class abstractvfs(object): """Abstract base class; cannot be instantiated""" @@ -294,8 +314,7 @@ # to a directory. Let the posixfile() call below raise IOError. if basename: if atomictemp: - if not os.path.isdir(dirname): - util.makedirs(dirname, self.createmode) + util.ensuredirs(dirname, self.createmode) return util.atomictempfile(f, mode, self.createmode) try: if 'w' in mode: @@ -313,8 +332,7 @@ if e.errno != errno.ENOENT: raise nlink = 0 - if not os.path.isdir(dirname): - util.makedirs(dirname, self.createmode) + util.ensuredirs(dirname, self.createmode) if nlink > 0: if self._trustnlink is None: self._trustnlink = nlink > 1 or util.checknlink(f) @@ -333,9 +351,7 @@ except OSError: pass - dirname = os.path.dirname(linkname) - if not os.path.exists(dirname): - util.makedirs(dirname, self.createmode) + util.ensuredirs(os.path.dirname(linkname), self.createmode) if self._cansymlink: try: @@ -523,84 +539,6 @@ _rcpath = osrcpath() return _rcpath -if os.name != 'nt': - - def rcfiles(path): - rcs = [os.path.join(path, 'hgrc')] - rcdir = os.path.join(path, 'hgrc.d') - try: - rcs.extend([os.path.join(rcdir, f) - for f, kind in osutil.listdir(rcdir) - if f.endswith(".rc")]) - except OSError: - pass - return rcs - - def systemrcpath(): - path = [] - if sys.platform == 'plan9': - root = 'lib/mercurial' - else: - root = 'etc/mercurial' - # old mod_python does not set sys.argv - if len(getattr(sys, 'argv', [])) > 0: - p = os.path.dirname(os.path.dirname(sys.argv[0])) - path.extend(rcfiles(os.path.join(p, root))) - path.extend(rcfiles('/' + root)) - return path - - def userrcpath(): - if sys.platform == 'plan9': - return [os.environ['home'] + '/lib/hgrc'] - else: - return [os.path.expanduser('~/.hgrc')] - -else: - - import _winreg - - def systemrcpath(): - '''return default os-specific hgrc search path''' - rcpath = [] - filename = util.executablepath() - # Use mercurial.ini found in directory with hg.exe - progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini') - if os.path.isfile(progrc): - rcpath.append(progrc) - return rcpath - # Use hgrc.d found in directory with hg.exe - progrcd = os.path.join(os.path.dirname(filename), 'hgrc.d') - if os.path.isdir(progrcd): - for f, kind in osutil.listdir(progrcd): - if f.endswith('.rc'): - rcpath.append(os.path.join(progrcd, f)) - return rcpath - # else look for a system rcpath in the registry - value = util.lookupreg('SOFTWARE\\Mercurial', None, - _winreg.HKEY_LOCAL_MACHINE) - if not isinstance(value, str) or not value: - return rcpath - value = util.localpath(value) - for p in value.split(os.pathsep): - if p.lower().endswith('mercurial.ini'): - rcpath.append(p) - elif os.path.isdir(p): - for f, kind in osutil.listdir(p): - if f.endswith('.rc'): - rcpath.append(os.path.join(p, f)) - return rcpath - - def userrcpath(): - '''return os-specific hgrc search path to the user dir''' - home = os.path.expanduser('~') - path = [os.path.join(home, 'mercurial.ini'), - os.path.join(home, '.hgrc')] - userprofile = os.environ.get('USERPROFILE') - if userprofile: - path.append(os.path.join(userprofile, 'mercurial.ini')) - path.append(os.path.join(userprofile, '.hgrc')) - return path - def revsingle(repo, revspec, default='.'): if not revspec: return repo[default] @@ -737,29 +675,26 @@ rejected = [] m.bad = lambda x, y: rejected.append(x) - for abs in repo.walk(m): - target = repo.wjoin(abs) - good = True - try: - audit_path(abs) - except (OSError, util.Abort): - good = False - rel = m.rel(abs) - exact = m.exact(abs) - if good and abs not in repo.dirstate: + ctx = repo[None] + walkresults = repo.dirstate.walk(m, sorted(ctx.substate), True, False) + for abs in sorted(walkresults): + st = walkresults[abs] + dstate = repo.dirstate[abs] + if dstate == '?' and audit_path.check(abs): unknown.append(abs) - if repo.ui.verbose or not exact: + if repo.ui.verbose or not m.exact(abs): + rel = m.rel(abs) repo.ui.status(_('adding %s\n') % ((pats and rel) or abs)) - elif (repo.dirstate[abs] != 'r' and - (not good or not os.path.lexists(target) or - (os.path.isdir(target) and not os.path.islink(target)))): + elif (dstate != 'r' and (not st or + (stat.S_ISDIR(st.st_mode) and not stat.S_ISLNK(st.st_mode)))): deleted.append(abs) - if repo.ui.verbose or not exact: + if repo.ui.verbose or not m.exact(abs): + rel = m.rel(abs) repo.ui.status(_('removing %s\n') % ((pats and rel) or abs)) # for finding renames - elif repo.dirstate[abs] == 'r': + elif dstate == 'r': removed.append(abs) - elif repo.dirstate[abs] == 'a': + elif dstate == 'a': added.append(abs) copies = {} if similarity > 0:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/scmwindows.py Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,46 @@ +import os +import osutil +import util +import _winreg + +def systemrcpath(): + '''return default os-specific hgrc search path''' + rcpath = [] + filename = util.executablepath() + # Use mercurial.ini found in directory with hg.exe + progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini') + if os.path.isfile(progrc): + rcpath.append(progrc) + return rcpath + # Use hgrc.d found in directory with hg.exe + progrcd = os.path.join(os.path.dirname(filename), 'hgrc.d') + if os.path.isdir(progrcd): + for f, kind in osutil.listdir(progrcd): + if f.endswith('.rc'): + rcpath.append(os.path.join(progrcd, f)) + return rcpath + # else look for a system rcpath in the registry + value = util.lookupreg('SOFTWARE\\Mercurial', None, + _winreg.HKEY_LOCAL_MACHINE) + if not isinstance(value, str) or not value: + return rcpath + value = util.localpath(value) + for p in value.split(os.pathsep): + if p.lower().endswith('mercurial.ini'): + rcpath.append(p) + elif os.path.isdir(p): + for f, kind in osutil.listdir(p): + if f.endswith('.rc'): + rcpath.append(os.path.join(p, f)) + return rcpath + +def userrcpath(): + '''return os-specific hgrc search path to the user dir''' + home = os.path.expanduser('~') + path = [os.path.join(home, 'mercurial.ini'), + os.path.join(home, '.hgrc')] + userprofile = os.environ.get('USERPROFILE') + if userprofile: + path.append(os.path.join(userprofile, 'mercurial.ini')) + path.append(os.path.join(userprofile, '.hgrc')) + return path
--- a/mercurial/templatefilters.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templatefilters.py Thu Feb 28 14:51:59 2013 +0100 @@ -392,6 +392,15 @@ "xmlescape": xmlescape, } +def websub(text, websubtable): + """:websub: Any text. Only applies to hgweb. Applies the regular + expression replacements defined in the websub section. + """ + if websubtable: + for regexp, format in websubtable: + text = regexp.sub(format, text) + return text + def fillfunc(context, mapping, args): if not (1 <= len(args) <= 2): raise error.ParseError(_("fill expects one or two arguments"))
--- a/mercurial/templatekw.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templatekw.py Thu Feb 28 14:51:59 2013 +0100 @@ -244,8 +244,8 @@ copies.append((fn, rename[0])) c = [{'name': x[0], 'source': x[1]} for x in copies] - return showlist('file_copy', c, plural='file_copies', - element='file', **args) + f = _showlist('file_copy', c, plural='file_copies', **args) + return _hybrid(f, c) # showfilecopiesswitch() displays file copies only if copy records are # provided before calling the templater, usually with a --copies @@ -256,8 +256,8 @@ """ copies = args['revcache'].get('copies') or [] c = [{'name': x[0], 'source': x[1]} for x in copies] - return showlist('file_copy', c, plural='file_copies', - element='file', **args) + f = _showlist('file_copy', c, plural='file_copies', **args) + return _hybrid(f, c) def showfiledels(**args): """:file_dels: List of strings. Files removed by this changeset."""
--- a/mercurial/templater.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templater.py Thu Feb 28 14:51:59 2013 +0100 @@ -207,6 +207,19 @@ f = context._filters[n] return (runfilter, (args[0][0], args[0][1], f)) +def get(context, mapping, args): + if len(args) != 2: + # i18n: "get" is a keyword + raise error.ParseError(_("get() expects two arguments")) + + dictarg = args[0][0](context, mapping, args[0][1]) + if not util.safehasattr(dictarg, 'get'): + # i18n: "get" is a keyword + raise error.ParseError(_("get() expects a dict as first argument")) + + key = args[1][0](context, mapping, args[1][1]) + yield dictarg.get(key) + def join(context, mapping, args): if not (1 <= len(args) <= 2): # i18n: "join" is a keyword @@ -285,11 +298,12 @@ } funcs = { + "get": get, "if": if_, "ifeq": ifeq, "join": join, + "label": label, "sub": sub, - "label": label, } # template engine
--- a/mercurial/templates/gitweb/changelogentry.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/gitweb/changelogentry.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -8,7 +8,7 @@ <i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/> </div> <div class="log_body"> -{desc|strip|escape|addbreaks|nonempty} +{desc|strip|escape|websub|addbreaks|nonempty} <br/> <br/> </div>
--- a/mercurial/templates/gitweb/changeset.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/gitweb/changeset.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -41,7 +41,7 @@ </table></div> <div class="page_body"> -{desc|strip|escape|addbreaks|nonempty} +{desc|strip|escape|websub|addbreaks|nonempty} </div> <div class="list_head"></div> <div class="title_text">
--- a/mercurial/templates/gitweb/fileannotate.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/gitweb/fileannotate.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -56,7 +56,7 @@ </div> <div class="page_path"> -{desc|strip|escape|addbreaks|nonempty} +{desc|strip|escape|websub|addbreaks|nonempty} </div> <div class="page_body"> <table>
--- a/mercurial/templates/gitweb/filerevision.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/gitweb/filerevision.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -56,7 +56,7 @@ </div> <div class="page_path"> -{desc|strip|escape|addbreaks|nonempty} +{desc|strip|escape|websub|addbreaks|nonempty} </div> <div class="page_body">
--- a/mercurial/templates/monoblue/changelogentry.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/monoblue/changelogentry.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -2,5 +2,5 @@ <ul class="changelog-entry"> <li class="age">{date|rfc822date}</li> <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li> - <li class="description">{desc|strip|escape|addbreaks|nonempty}</li> + <li class="description">{desc|strip|escape|websub|addbreaks|nonempty}</li> </ul>
--- a/mercurial/templates/monoblue/changeset.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/monoblue/changeset.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -52,7 +52,7 @@ {child%changesetchild} </dl> - <p class="description">{desc|strip|escape|addbreaks|nonempty}</p> + <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p> <table> {files}
--- a/mercurial/templates/monoblue/fileannotate.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/monoblue/fileannotate.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -57,7 +57,7 @@ <dd>{permissions|permissions}</dd> </dl> - <p class="description">{desc|strip|escape|addbreaks|nonempty}</p> + <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p> <table class="annotated"> {annotate%annotateline}
--- a/mercurial/templates/monoblue/filerevision.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/monoblue/filerevision.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -57,7 +57,7 @@ <dd>{permissions|permissions}</dd> </dl> - <p class="description">{desc|strip|escape|addbreaks|nonempty}</p> + <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p> <div class="source"> {text%fileline}
--- a/mercurial/templates/paper/changeset.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/paper/changeset.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -40,7 +40,7 @@ files, or words in the commit message</div> </form> -<div class="description">{desc|strip|escape|nonempty}</div> +<div class="description">{desc|strip|escape|websub|nonempty}</div> <table id="changesetEntry"> <tr>
--- a/mercurial/templates/paper/fileannotate.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/paper/fileannotate.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -46,7 +46,7 @@ files, or words in the commit message</div> </form> -<div class="description">{desc|strip|escape|nonempty}</div> +<div class="description">{desc|strip|escape|websub|nonempty}</div> <table id="changesetEntry"> <tr>
--- a/mercurial/templates/paper/filecomparison.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/paper/filecomparison.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -45,7 +45,7 @@ files, or words in the commit message</div> </form> -<div class="description">{desc|strip|escape|nonempty}</div> +<div class="description">{desc|strip|escape|websub|nonempty}</div> <table id="changesetEntry"> <tr>
--- a/mercurial/templates/paper/filediff.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/paper/filediff.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -45,7 +45,7 @@ files, or words in the commit message</div> </form> -<div class="description">{desc|strip|escape|nonempty}</div> +<div class="description">{desc|strip|escape|websub|nonempty}</div> <table id="changesetEntry"> <tr>
--- a/mercurial/templates/paper/filerevision.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/paper/filerevision.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -44,7 +44,7 @@ files, or words in the commit message</div> </form> -<div class="description">{desc|strip|escape|nonempty}</div> +<div class="description">{desc|strip|escape|websub|nonempty}</div> <table id="changesetEntry"> <tr>
--- a/mercurial/templates/spartan/changeset.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/spartan/changeset.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -39,7 +39,7 @@ </tr> <tr> <th class="description">description:</th> - <td class="description">{desc|strip|escape|addbreaks|nonempty}</td> + <td class="description">{desc|strip|escape|websub|addbreaks|nonempty}</td> </tr> </table>
--- a/mercurial/templates/spartan/fileannotate.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/spartan/fileannotate.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -38,7 +38,7 @@ </tr> <tr> <td class="metatag">description:</td> - <td>{desc|strip|escape|addbreaks|nonempty}</td> + <td>{desc|strip|escape|websub|addbreaks|nonempty}</td> </tr> </table>
--- a/mercurial/templates/spartan/filerevision.tmpl Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/spartan/filerevision.tmpl Thu Feb 28 14:51:59 2013 +0100 @@ -36,7 +36,7 @@ <td>{permissions|permissions}</td></tr> <tr> <td class="metatag">description:</td> - <td>{desc|strip|escape|addbreaks|nonempty}</td> + <td>{desc|strip|escape|websub|addbreaks|nonempty}</td> </tr> </table>
--- a/mercurial/templates/static/style-coal.css Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/static/style-coal.css Thu Feb 28 14:51:59 2013 +0100 @@ -191,7 +191,7 @@ } .bigtable tr { border: none; } .bigtable .age { width: 6em; } -.bigtable .author { width: 12em; } +.bigtable .author { width: 15em; } .bigtable .description { } .bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; } .bigtable .node { width: 5em; font-family: monospace;}
--- a/mercurial/templates/static/style-paper.css Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/templates/static/style-paper.css Thu Feb 28 14:51:59 2013 +0100 @@ -188,7 +188,7 @@ } .bigtable tr { border: none; } .bigtable .age { width: 7em; } -.bigtable .author { width: 12em; } +.bigtable .author { width: 15em; } .bigtable .description { } .bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; } .bigtable .node { width: 5em; font-family: monospace;}
--- a/mercurial/ui.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/ui.py Thu Feb 28 14:51:59 2013 +0100 @@ -739,7 +739,7 @@ else: self.debug('%s:%s %s%s\n' % (topic, item, pos, unit)) - def log(self, service, message): + def log(self, service, *msg, **opts): '''hook for logging facility extensions service should be a readily-identifiable subsystem, which will
--- a/mercurial/util.py Thu Feb 28 13:55:00 2013 +0100 +++ b/mercurial/util.py Thu Feb 28 14:51:59 2013 +0100 @@ -211,6 +211,31 @@ del self[i] break +class lrucachedict(object): + '''cache most recent gets from or sets to this dictionary''' + def __init__(self, maxsize): + self._cache = {} + self._maxsize = maxsize + self._order = deque() + + def __getitem__(self, key): + value = self._cache[key] + self._order.remove(key) + self._order.append(key) + return value + + def __setitem__(self, key, value): + if key not in self._cache: + if len(self._cache) >= self._maxsize: + del self._cache[self._order.popleft()] + else: + self._order.remove(key) + self._cache[key] = value + self._order.append(key) + + def __contains__(self, key): + return key in self._cache + def lrucachefunc(func): '''cache most recent results of function calls''' cache = {} @@ -855,6 +880,23 @@ if mode is not None: os.chmod(name, mode) +def ensuredirs(name, mode=None): + """race-safe recursive directory creation""" + if os.path.isdir(name): + return + parent = os.path.dirname(os.path.abspath(name)) + if parent != name: + ensuredirs(parent, mode) + try: + os.mkdir(name) + except OSError, err: + if err.errno == errno.EEXIST and os.path.isdir(name): + # someone else seems to have won a directory creation race + return + raise + if mode is not None: + os.chmod(name, mode) + def readfile(path): fp = open(path, 'rb') try: @@ -1027,6 +1069,20 @@ The date may be a "unixtime offset" string or in one of the specified formats. If the date already is a (unixtime, offset) tuple, it is returned. + + >>> parsedate(' today ') == parsedate(\ + datetime.date.today().strftime('%b %d')) + True + >>> parsedate( 'yesterday ') == parsedate((datetime.date.today() -\ + datetime.timedelta(days=1)\ + ).strftime('%b %d')) + True + >>> now, tz = makedate() + >>> strnow, strtz = parsedate('now') + >>> (strnow - now) < 1 + True + >>> tz == strtz + True """ if not date: return 0, 0 @@ -1035,6 +1091,15 @@ if not formats: formats = defaultdateformats date = date.strip() + + if date == _('now'): + return makedate() + if date == _('today'): + date = datetime.date.today().strftime('%b %d') + elif date == _('yesterday'): + date = (datetime.date.today() - + datetime.timedelta(days=1)).strftime('%b %d') + try: when, offset = map(int, date.split(' ')) except ValueError:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/worker.py Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,155 @@ +# worker.py - master-slave parallelism support +# +# Copyright 2013 Facebook, Inc. +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2 or any later version. + +from i18n import _ +import os, signal, sys, threading, util + +def countcpus(): + '''try to count the number of CPUs on the system''' + + # posix + try: + n = int(os.sysconf('SC_NPROCESSORS_ONLN')) + if n > 0: + return n + except (AttributeError, ValueError): + pass + + # windows + try: + n = int(os.environ['NUMBER_OF_PROCESSORS']) + if n > 0: + return n + except (KeyError, ValueError): + pass + + return 1 + +def _numworkers(ui): + s = ui.config('worker', 'numcpus') + if s: + try: + n = int(s) + if n >= 1: + return n + except ValueError: + raise util.Abort(_('number of cpus must be an integer')) + return min(max(countcpus(), 4), 32) + +if os.name == 'posix': + _startupcost = 0.01 +else: + _startupcost = 1e30 + +def worthwhile(ui, costperop, nops): + '''try to determine whether the benefit of multiple processes can + outweigh the cost of starting them''' + linear = costperop * nops + workers = _numworkers(ui) + benefit = linear - (_startupcost * workers + linear / workers) + return benefit >= 0.15 + +def worker(ui, costperarg, func, staticargs, args): + '''run a function, possibly in parallel in multiple worker + processes. + + returns a progress iterator + + costperarg - cost of a single task + + func - function to run + + staticargs - arguments to pass to every invocation of the function + + args - arguments to split into chunks, to pass to individual + workers + ''' + if worthwhile(ui, costperarg, len(args)): + return _platformworker(ui, func, staticargs, args) + return func(*staticargs + (args,)) + +def _posixworker(ui, func, staticargs, args): + rfd, wfd = os.pipe() + workers = _numworkers(ui) + oldhandler = signal.getsignal(signal.SIGINT) + signal.signal(signal.SIGINT, signal.SIG_IGN) + pids, problem = [], [0] + for pargs in partition(args, workers): + pid = os.fork() + if pid == 0: + signal.signal(signal.SIGINT, oldhandler) + try: + os.close(rfd) + for i, item in func(*(staticargs + (pargs,))): + os.write(wfd, '%d %s\n' % (i, item)) + os._exit(0) + except KeyboardInterrupt: + os._exit(255) + pids.append(pid) + pids.reverse() + os.close(wfd) + fp = os.fdopen(rfd, 'rb', 0) + def killworkers(): + # if one worker bails, there's no good reason to wait for the rest + for p in pids: + try: + os.kill(p, signal.SIGTERM) + except OSError, err: + if err.errno != errno.ESRCH: + raise + def waitforworkers(): + for _ in pids: + st = _exitstatus(os.wait()[1]) + if st and not problem: + problem[0] = st + killworkers() + t = threading.Thread(target=waitforworkers) + t.start() + def cleanup(): + signal.signal(signal.SIGINT, oldhandler) + t.join() + status = problem[0] + if status: + if status < 0: + os.kill(os.getpid(), -status) + sys.exit(status) + try: + for line in fp: + l = line.split(' ', 1) + yield int(l[0]), l[1][:-1] + except: # re-raises + killworkers() + cleanup() + raise + cleanup() + +def _posixexitstatus(code): + '''convert a posix exit status into the same form returned by + os.spawnv + + returns None if the process was stopped instead of exiting''' + if os.WIFEXITED(code): + return os.WEXITSTATUS(code) + elif os.WIFSIGNALED(code): + return -os.WTERMSIG(code) + +if os.name != 'nt': + _platformworker = _posixworker + _exitstatus = _posixexitstatus + +def partition(lst, nslices): + '''partition a list into N slices of equal size''' + n = len(lst) + chunk, slop = n / nslices, n % nslices + end = 0 + for i in xrange(nslices): + start = end + end = start + chunk + if slop: + end += 1 + slop -= 1 + yield lst[start:end]
--- a/tests/run-tests.py Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/run-tests.py Thu Feb 28 14:51:59 2013 +0100 @@ -52,6 +52,7 @@ import sys import tempfile import time +import random import re import threading import killdaemons as killmod @@ -540,6 +541,13 @@ def globmatch(el, l): # The only supported special characters are * and ? plus / which also # matches \ on windows. Escaping of these caracters is supported. + if el + '\n' == l: + if os.name == 'nt': + # matching on "/" is not needed for this line + iolock.acquire() + print "\nInfo, unnecessary glob: %s (glob)" % el + iolock.release() + return True i, n = 0, len(el) res = '' while i < n: @@ -622,6 +630,7 @@ script.append('set -x\n') if os.getenv('MSYSTEM'): script.append('alias pwd="pwd -W"\n') + n = 0 for n, l in enumerate(t): if not l.endswith('\n'): l += '\n' @@ -1252,7 +1261,11 @@ os.environ['no_proxy'] = '' os.environ['NO_PROXY'] = '' os.environ['TERM'] = 'xterm' - os.environ['PYTHONHASHSEED'] = os.environ.get('PYTHONHASHSEED', 'random') + if 'PYTHONHASHSEED' not in os.environ: + # use a random python hash seed all the time + # we do the randomness ourself to know what seed is used + os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32)) + print 'python hash seed:', os.environ['PYTHONHASHSEED'] # unset env related to hooks for k in os.environ.keys():
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/silenttestrunner.py Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,18 @@ +import unittest, sys + +def main(modulename): + '''run the tests found in module, printing nothing when all tests pass''' + module = sys.modules[modulename] + suite = unittest.defaultTestLoader.loadTestsFromModule(module) + results = unittest.TestResult() + suite.run(results) + if results.errors or results.failures: + for tc, exc in results.errors: + print 'ERROR:', tc + print + sys.stdout.write(exc) + for tc, exc in results.failures: + print 'FAIL:', tc + print + sys.stdout.write(exc) + sys.exit(1)
--- a/tests/test-alias.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-alias.t Thu Feb 28 14:51:59 2013 +0100 @@ -17,6 +17,7 @@ > no-R = status -R elsewhere > no--repo = status --repo elsewhere > no--repository = status --repository elsewhere + > no--config = status --config a.config=1 > mylog = log > lognull = log -r null > shortlog = log --template '{rev} {node|short} | {date|isodate}\n' @@ -106,6 +107,8 @@ error in definition for alias 'no--repository': --repository may only be given on the command line $ hg help no--repository error in definition for alias 'no--repository': --repository may only be given on the command line + $ hg no--config + error in definition for alias 'no--config': --config may only be given on the command line optional repository @@ -181,6 +184,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID e63c23eaa88ae77967edcf4ea194d31167c478b0 # Parent 0000000000000000000000000000000000000000 foo @@ -224,7 +228,7 @@ 2 $ hg tglog - @ 1:7e7f92de180e: 'bar' + @ 1:042423737847: 'bar' | o 0:e63c23eaa88a: 'foo' @@ -237,15 +241,15 @@ idalias idaliaslong idaliasshell identify import incoming init [255] $ hg id - 7e7f92de180e tip + 042423737847 tip $ hg ida hg: command 'ida' is ambiguous: idalias idaliaslong idaliasshell [255] $ hg idalias - 7e7f92de180e tip + 042423737847 tip $ hg idaliasl - 7e7f92de180e tip + 042423737847 tip $ hg idaliass test $ hg parentsshell
--- a/tests/test-atomictempfile.py Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-atomictempfile.py Thu Feb 28 14:51:59 2013 +0100 @@ -1,48 +1,42 @@ import os import glob +import unittest +import silenttestrunner + from mercurial.util import atomictempfile -# basic usage -def test1_simple(): - if os.path.exists('foo'): - os.remove('foo') - file = atomictempfile('foo') - (dir, basename) = os.path.split(file._tempname) - assert not os.path.isfile('foo') - assert basename in glob.glob('.foo-*') +class testatomictempfile(unittest.TestCase): + def test1_simple(self): + if os.path.exists('foo'): + os.remove('foo') + file = atomictempfile('foo') + (dir, basename) = os.path.split(file._tempname) + self.assertFalse(os.path.isfile('foo')) + self.assertTrue(basename in glob.glob('.foo-*')) - file.write('argh\n') - file.close() + file.write('argh\n') + file.close() - assert os.path.isfile('foo') - assert basename not in glob.glob('.foo-*') - print 'OK' + self.assertTrue(os.path.isfile('foo')) + self.assertTrue(basename not in glob.glob('.foo-*')) -# discard() removes the temp file without making the write permanent -def test2_discard(): - if os.path.exists('foo'): - os.remove('foo') - file = atomictempfile('foo') - (dir, basename) = os.path.split(file._tempname) - - file.write('yo\n') - file.discard() + # discard() removes the temp file without making the write permanent + def test2_discard(self): + if os.path.exists('foo'): + os.remove('foo') + file = atomictempfile('foo') + (dir, basename) = os.path.split(file._tempname) - assert not os.path.isfile('foo') - assert basename not in os.listdir('.') - print 'OK' + file.write('yo\n') + file.discard() -# if a programmer screws up and passes bad args to atomictempfile, they -# get a plain ordinary TypeError, not infinite recursion -def test3_oops(): - try: - file = atomictempfile() - except TypeError: - print "OK" - else: - print "expected TypeError" + self.assertFalse(os.path.isfile('foo')) + self.assertTrue(basename not in os.listdir('.')) + + # if a programmer screws up and passes bad args to atomictempfile, they + # get a plain ordinary TypeError, not infinite recursion + def test3_oops(self): + self.assertRaises(TypeError, atomictempfile) if __name__ == '__main__': - test1_simple() - test2_discard() - test3_oops() + silenttestrunner.main(__name__)
--- a/tests/test-atomictempfile.py.out Thu Feb 28 13:55:00 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -OK -OK -OK
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-blackbox.t Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,79 @@ +setup + $ cat > mock.py <<EOF + > from mercurial import util + > import getpass + > + > def makedate(): + > return 0, 0 + > def getuser(): + > return 'bob' + > # mock the date and user apis so the output is always the same + > def uisetup(ui): + > util.makedate = makedate + > getpass.getuser = getuser + > EOF + $ cat >> $HGRCPATH <<EOF + > [extensions] + > blackbox= + > mock=`pwd`/mock.py + > EOF + $ hg init blackboxtest + $ cd blackboxtest + +command, exit codes, and duration + + $ echo a > a + $ hg add a + $ hg blackbox + 1970/01/01 00:00:00 bob> add a + 1970/01/01 00:00:00 bob> add exited 0 after * seconds (glob) + +incoming change tracking + +create two heads to verify that we only see one change in the log later + $ hg commit -ma + $ hg up null + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ echo b > b + $ hg commit -Amb + adding b + created new head + +clone, commit, pull + $ hg clone . ../blackboxtest2 + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo c > c + $ hg commit -Amc + adding c + $ cd ../blackboxtest2 + $ hg pull + pulling from $TESTTMP/blackboxtest (glob) + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + (run 'hg update' to get a working copy) + $ hg blackbox -l 3 + 1970/01/01 00:00:00 bob> pull + 1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62 + 1970/01/01 00:00:00 bob> pull exited None after * seconds (glob) + +extension and python hooks - use the eol extension for a pythonhook + + $ echo '[extensions]' >> .hg/hgrc + $ echo 'eol=' >> .hg/hgrc + $ echo '[hooks]' >> .hg/hgrc + $ echo 'update = echo hooked' >> .hg/hgrc + $ hg update + hooked + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg blackbox -l 4 + 1970/01/01 00:00:00 bob> update + 1970/01/01 00:00:00 bob> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob) + 1970/01/01 00:00:00 bob> exthook-update: echo hooked finished in * seconds (glob) + 1970/01/01 00:00:00 bob> update exited False after * seconds (glob) + +cleanup + $ cd ..
--- a/tests/test-bookmarks.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-bookmarks.t Thu Feb 28 14:51:59 2013 +0100 @@ -257,6 +257,12 @@ abort: a bookmark cannot have the name of an existing branch [255] +bookmark with integer name + + $ hg bookmark 10 + abort: a bookmark cannot have an integer as its name + [255] + incompatible options $ hg bookmark -m Y -d Z @@ -461,6 +467,13 @@ update to current bookmark if it's not the parent + $ hg summary + parent: 2:db815d6d32e6 + 2 + branch: default + bookmarks: [Z] Y x y + commit: 1 added, 1 unknown (new branch head) + update: 2 new changesets (update) $ hg update updating to active bookmark Z 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-check-code-hg.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-check-code-hg.t Thu Feb 28 14:51:59 2013 +0100 @@ -1,6 +1,6 @@ $ check_code="$TESTDIR"/../contrib/check-code.py $ cd "$TESTDIR"/.. - $ if hg identify -q > /dev/null; then : + $ if hg identify -q > /dev/null 2>&1; then : > else > echo "skipped: not a Mercurial working dir" >&2 > exit 80 @@ -8,4 +8,6 @@ New errors are not allowed. Warnings are strongly discouraged. - $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 + $ hg manifest 2>/dev/null \ + > | xargs "$check_code" --warnings --nolineno --per-file=0 \ + > || false
--- a/tests/test-command-template.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-command-template.t Thu Feb 28 14:51:59 2013 +0100 @@ -43,6 +43,9 @@ $ hg mv second fourth $ hg commit -m third -d "2020-01-01 10:01" + $ hg log --template '{file_copies % "{source} -> {name}\n"}' -r . + second -> fourth + Quoting for ui.logtemplate $ hg tip --config "ui.logtemplate={rev}\n"
--- a/tests/test-commit.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-commit.t Thu Feb 28 14:51:59 2013 +0100 @@ -263,6 +263,7 @@ $ cd commitmsg $ echo changed > changed $ echo removed > removed + $ hg book currentbookmark $ hg ci -qAm init $ hg rm removed @@ -277,6 +278,7 @@ HG: -- HG: user: test HG: branch 'default' + HG: bookmark 'currentbookmark' HG: added added HG: changed changed HG: removed removed
--- a/tests/test-convert-git.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-convert-git.t Thu Feb 28 14:51:59 2013 +0100 @@ -281,24 +281,6 @@ abort: --sourcesort is not supported by this data source [255] -damage git repository and convert again - - $ cat > damage.py <<EOF - > import os - > import stat - > for root, dirs, files in os.walk('git-repo4/.git/objects'): - > if files: - > path = os.path.join(root, files[0]) - > if os.name == 'nt': - > os.chmod(path, stat.S_IWUSR) - > os.remove(path) - > break - > EOF - $ python damage.py - $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | \ - > grep 'abort:' | sed 's/abort:.*/abort:/g' - abort: - test sub modules $ mkdir git-repo5 @@ -345,3 +327,32 @@ $ cd git-repo5 $ cat foo sub + + $ cd ../.. + +damaged git repository tests: +In case the hard-coded hashes change, the following commands can be used to +list the hashes and their corresponding types in the repository: +cd git-repo4/.git/objects +find . -type f | cut -c 3- | sed 's_/__' | xargs -n 1 -t git cat-file -t +cd ../../.. + +damage git repository by renaming a commit object + $ COMMIT_OBJ=1c/0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd + $ mv git-repo4/.git/objects/$COMMIT_OBJ git-repo4/.git/objects/$COMMIT_OBJ.tmp + $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:' + abort: cannot read tags from git-repo4/.git + $ mv git-repo4/.git/objects/$COMMIT_OBJ.tmp git-repo4/.git/objects/$COMMIT_OBJ +damage git repository by renaming a blob object + + $ BLOB_OBJ=8b/137891791fe96927ad78e64b0aad7bded08bdc + $ mv git-repo4/.git/objects/$BLOB_OBJ git-repo4/.git/objects/$BLOB_OBJ.tmp + $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:' + abort: cannot read 'blob' object at 8b137891791fe96927ad78e64b0aad7bded08bdc + $ mv git-repo4/.git/objects/$BLOB_OBJ.tmp git-repo4/.git/objects/$BLOB_OBJ +damage git repository by renaming a tree object + + $ TREE_OBJ=72/49f083d2a63a41cc737764a86981eb5f3e4635 + $ mv git-repo4/.git/objects/$TREE_OBJ git-repo4/.git/objects/$TREE_OBJ.tmp + $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:' + abort: cannot read changes in 1c0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd
--- a/tests/test-copy-move-merge.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-copy-move-merge.t Thu Feb 28 14:51:59 2013 +0100 @@ -29,12 +29,12 @@ src: 'a' -> dst: 'c' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 a: remote moved to b -> m + preserving a for resolve of b a: remote moved to c -> m - preserving a for resolve of b - preserving a for resolve of c + preserving a for resolve of c removing a updating: a 1/2 files (50.00%) picked tool 'internal:merge' for b (binary False symlink False)
--- a/tests/test-diff-color.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-diff-color.t Thu Feb 28 14:51:59 2013 +0100 @@ -152,7 +152,7 @@ c c \x1b[0;32m+aa\x1b[0m (esc) - \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (glob) (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)
--- a/tests/test-double-merge.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-double-merge.t Thu Feb 28 14:51:59 2013 +0100 @@ -33,12 +33,12 @@ src: 'foo' -> dst: 'bar' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 + foo: remote copied to bar -> m + preserving foo for resolve of bar foo: versions differ -> m - foo: remote copied to bar -> m - preserving foo for resolve of bar - preserving foo for resolve of foo + preserving foo for resolve of foo updating: foo 1/2 files (50.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar
--- a/tests/test-export.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-export.t Thu Feb 28 14:51:59 2013 +0100 @@ -91,13 +91,28 @@ foo-foo_10.patch foo-foo_11.patch +Doing it again clobbers the files rather than appending: + $ hg export -v -o "foo-%m.patch" 2:3 + exporting patches: + foo-foo_2.patch + foo-foo_3.patch + $ grep HG foo-foo_2.patch | wc -l + \s*1 (re) + $ grep HG foo-foo_3.patch | wc -l + \s*1 (re) + Exporting 4 changesets to a file: $ hg export -o export_internal 1 2 3 4 $ grep HG export_internal | wc -l \s*4 (re) -Exporting 4 changesets to a file: +Doing it again clobbers the file rather than appending: + $ hg export -o export_internal 1 2 3 4 + $ grep HG export_internal | wc -l + \s*4 (re) + +Exporting 4 changesets to stdout: $ hg export 1 2 3 4 | grep HG | wc -l \s*4 (re) @@ -108,6 +123,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 5f17a83f5fbd9414006a5e563eab4c8a00729efd # Parent 747d3c68f8ec44bb35816bfcd59aeb50b9654c2f foo-10 @@ -154,6 +170,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID * (glob) # Parent * (glob) !"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
--- a/tests/test-extension.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-extension.t Thu Feb 28 14:51:59 2013 +0100 @@ -112,7 +112,8 @@ > wsgicgi.launch(application) > EOF - $ SCRIPT_NAME='/' SERVER_PORT='80' SERVER_NAME='localhost' python hgweb.cgi \ + $ REQUEST_METHOD='GET' PATH_INFO='/' SCRIPT_NAME='' QUERY_STRING='' \ + > SERVER_PORT='80' SERVER_NAME='localhost' python hgweb.cgi \ > | grep '^[0-9]) ' # ignores HTML output 1) foo imported 1) bar imported
--- a/tests/test-graft.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-graft.t Thu Feb 28 14:51:59 2013 +0100 @@ -84,6 +84,7 @@ # HG changeset patch # User foo # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e 2 @@ -134,10 +135,10 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: True, partial: False ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 b: local copied/moved to a -> m - preserving b for resolve of b + preserving b for resolve of b updating: b 1/1 files (100.00%) picked tool 'internal:merge' for b (binary False symlink False) merging b and a to b @@ -147,22 +148,22 @@ grafting revision 5 searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 e: remote is newer -> g + getting e updating: e 1/1 files (100.00%) - getting e e grafting revision 4 searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d d: remote is newer -> g e: versions differ -> m - preserving e for resolve of e + preserving e for resolve of e + getting d updating: d 1/2 files (50.00%) - getting d updating: e 2/2 files (100.00%) picked tool 'internal:merge' for e (binary False symlink False) merging e @@ -324,6 +325,7 @@ # HG changeset patch # User bar # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 64ecd9071ce83c6e62f538d8ce7709d53f32ebf7 # Parent 4bdb9a9d0b84ffee1d30f0dfc7744cade17aa19c 1 @@ -351,6 +353,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 2e80e1351d6ed50302fe1e05f8bd1d4d412b6e11 # Parent e5a51ae854a8bbaaf25cc5c6a57ff46042dadbb4 2
--- a/tests/test-hgweb-no-path-info.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-hgweb-no-path-info.t Thu Feb 28 14:51:59 2013 +0100 @@ -39,6 +39,7 @@ > 'wsgi.multiprocess': False, > 'wsgi.run_once': False, > 'REQUEST_METHOD': 'GET', + > 'PATH_INFO': '/', > 'SCRIPT_NAME': '', > 'SERVER_NAME': '127.0.0.1', > 'SERVER_PORT': os.environ['HGPORT'], @@ -49,6 +50,7 @@ > content = app(env, startrsp) > sys.stdout.write(output.getvalue()) > sys.stdout.write(''.join(content)) + > getattr(content, 'close', lambda : None)() > print '---- ERRORS' > print errors.getvalue() > @@ -101,7 +103,7 @@ [('Content-Type', 'text/plain; charset=ascii')] ---- DATA - repo/ + /repo/ ---- ERRORS
--- a/tests/test-hgweb-no-request-uri.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-hgweb-no-request-uri.t Thu Feb 28 14:51:59 2013 +0100 @@ -49,6 +49,7 @@ > content = app(env, startrsp) > sys.stdout.write(output.getvalue()) > sys.stdout.write(''.join(content)) + > getattr(content, 'close', lambda : None)() > print '---- ERRORS' > print errors.getvalue() >
--- a/tests/test-hgweb-raw.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-hgweb-raw.t Thu Feb 28 14:51:59 2013 +0100 @@ -19,7 +19,7 @@ $ cat hg.pid >> $DAEMON_PIDS $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt - $ while kill `cat hg.pid` 2>/dev/null; do sleep 0; done + $ "$TESTDIR/killdaemons.py" hg.pid $ cat getoutput.txt 200 Script output follows @@ -40,7 +40,7 @@ $ cat hg.pid >> $DAEMON_PIDS $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt - $ while kill `cat hg.pid` 2>/dev/null; do sleep 0; done + $ "$TESTDIR/killdaemons.py" hg.pid $ cat getoutput.txt 200 Script output follows
--- a/tests/test-histedit-edit.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-histedit-edit.t Thu Feb 28 14:51:59 2013 +0100 @@ -73,7 +73,7 @@ $ hg up 0 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ HGEDITOR='echo foobaz > ' hg histedit --continue - abort: working directory parent is not a descendant of 055a42cdd887 + abort: 055a42cdd887 is not an ancestor of working directory (update to 055a42cdd887 or descendant and run "hg histedit --continue" again) [255] $ hg up 3
--- a/tests/test-histedit-fold.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-histedit-fold.t Thu Feb 28 14:51:59 2013 +0100 @@ -295,6 +295,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323 # Parent 0189ba417d34df9dda55f88b637dcae9917b5964 +4
--- a/tests/test-histedit-revspec.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-histedit-revspec.t Thu Feb 28 14:51:59 2013 +0100 @@ -65,5 +65,5 @@ $ hg up 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg histedit -r 4 - nothing to edit - [1] + abort: 08d98a8350f3 is not an ancestor of working directory + [255]
--- a/tests/test-https.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-https.t Thu Feb 28 14:51:59 2013 +0100 @@ -106,7 +106,7 @@ #if windows $ hg serve -p $HGPORT --certificate=$PRIV 2>&1 - abort: cannot start server at ':$HGPORT': (glob) + abort: cannot start server at ':$HGPORT': [255] #else $ hg serve -p $HGPORT --certificate=$PRIV 2>&1 @@ -233,11 +233,13 @@ (check hostfingerprint configuration) [255] + - ignores that certificate doesn't match hostname $ hg -R copy-pull id https://127.0.0.1:$HGPORT/ 5fed3813f7f5 - $ while kill `cat hg1.pid` 2>/dev/null; do sleep 0; done +HGPORT1 is reused below for tinyproxy tests. Kill that server. + $ "$TESTDIR/killdaemons.py" hg1.pid Prepare for connecting through proxy
--- a/tests/test-import-merge.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-import-merge.t Thu Feb 28 14:51:59 2013 +0100 @@ -113,3 +113,41 @@ $ hg strip --no-backup tip $ cd .. + +Test that --exact on a bad header doesn't corrupt the repo (issue3616) + + $ hg init repo3 + $ cd repo3 + $ echo a>a + $ hg ci -Aqm0 + $ echo a>>a + $ hg ci -m1 + $ echo a>>a + $ hg ci -m2 + $ echo a>a + $ echo b>>a + $ echo a>>a + $ hg ci -m3 + $ hg export 2 | head -7 > ../a.patch + $ hg export tip | tail -n +8 >> ../a.patch + + $ cd .. + $ hg clone -qr0 repo3 repo3-clone + $ cd repo3-clone + $ hg pull -qr1 ../repo3 + + $ hg import --exact ../a.patch + applying ../a.patch + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + patching file a + Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). + transaction abort! + rollback completed + abort: patch is damaged or loses information + [255] + $ hg verify + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 2 changesets, 2 total revisions
--- a/tests/test-import.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-import.t Thu Feb 28 14:51:59 2013 +0100 @@ -34,7 +34,7 @@ $ hg --cwd b import ../exported-tip.patch applying ../exported-tip.patch -message and committer should be same +message and committer and date should be same $ hg --cwd b tip changeset: 1:1d4bd90af0e4 @@ -853,6 +853,7 @@ # HG changeset patch # User User B # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID eb56ab91903632294ac504838508cb370c0901d2 # Parent 0000000000000000000000000000000000000000 from: tricky!
--- a/tests/test-inotify-debuginotify.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-inotify-debuginotify.t Thu Feb 28 14:51:59 2013 +0100 @@ -38,4 +38,4 @@ directories being watched: / .hg/ - $ kill `cat hg.pid` + $ "$TESTDIR/killdaemons.py" hg.pid
--- a/tests/test-inotify-issue1371.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-inotify-issue1371.t Thu Feb 28 14:51:59 2013 +0100 @@ -41,4 +41,4 @@ Are we able to kill the service? if not, the service died on some error - $ kill `cat hg.pid` + $ "$TESTDIR/killdaemons.py" hg.pid
--- a/tests/test-inotify-issue1542.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-inotify-issue1542.t Thu Feb 28 14:51:59 2013 +0100 @@ -33,4 +33,4 @@ Are we able to kill the service? if not, the service died on some error - $ kill `cat hg.pid` + $ "$TESTDIR/killdaemons.py" hg.pid
--- a/tests/test-inotify-issue1556.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-inotify-issue1556.t Thu Feb 28 14:51:59 2013 +0100 @@ -28,4 +28,4 @@ Are we able to kill the service? if not, the service died on some error - $ kill `cat hg.pid` + $ "$TESTDIR/killdaemons.py" hg.pid
--- a/tests/test-inotify-lookup.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-inotify-lookup.t Thu Feb 28 14:51:59 2013 +0100 @@ -11,4 +11,4 @@ $ hg st $ cat a a - $ kill `cat .hg/inotify.pid` + $ "$TESTDIR/killdaemons.py" .hg/inotify.pid
--- a/tests/test-inotify.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-inotify.t Thu Feb 28 14:51:59 2013 +0100 @@ -32,7 +32,7 @@ make sure that pidfile worked. Output should be silent. - $ kill `cat ../hg2.pid` + $ "$TESTDIR/killdaemons.py" ../hg2.pid $ cd ../repo1 inserve @@ -157,7 +157,7 @@ build/x & build/y shouldn't appear in "hg st" $ hg st - $ kill `cat hg.pid` + $ "$TESTDIR/killdaemons.py" hg.pid $ cd .. @@ -179,4 +179,4 @@ abort: inotify-server: cannot start: socket is already bound [255] - $ kill `cat hg3.pid` + $ "$TESTDIR/killdaemons.py" hg3.pid
--- a/tests/test-interhg.t Thu Feb 28 13:55:00 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - $ "$TESTDIR/hghave" serve || exit 80 - - $ hg init test - $ cd test - - $ cat > .hg/hgrc <<EOF - > [extensions] - > interhg = - > - > [interhg] - > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>| - > - > # yes, 'x' is a weird delimiter... - > markbugs = sxbugx<i class="\x">bug</i>x - > EOF - - $ touch foo - $ hg add foo - $ hg commit -d '1 0' -m 'Issue123: fixed the bug!' - - $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log - $ cat hg.pid >> $DAEMON_PIDS - -log - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '' | grep bts - <td class="description"><a href="/rev/1b0e7ece6bd6"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</a><span class="branchhead">default</span> <span class="tag">tip</span> </td> - -errors - - $ cat errors.log - - $ cd ..
--- a/tests/test-issue1175.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-issue1175.t Thu Feb 28 14:51:59 2013 +0100 @@ -44,6 +44,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b # Parent 7fc86ba705e717a721dbc361bf8c9bc05a18ca2f 5
--- a/tests/test-issue1802.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-issue1802.t Thu Feb 28 14:51:59 2013 +0100 @@ -55,7 +55,7 @@ unmatched files in local: b resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 a: update permissions -> e updating: a 1/1 files (100.00%)
--- a/tests/test-issue522.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-issue522.t Thu Feb 28 14:51:59 2013 +0100 @@ -29,11 +29,11 @@ unmatched files in local: bar resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee foo: remote is newer -> g + getting foo updating: foo 1/1 files (100.00%) - getting foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-issue672.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-issue672.t Thu Feb 28 14:51:59 2013 +0100 @@ -32,14 +32,13 @@ src: '1' -> dst: '1a' checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a 1: other deleted -> r 1a: remote created -> g - updating: 1 1/2 files (50.00%) removing 1 + getting 1a updating: 1a 2/2 files (100.00%) - getting 1a 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -63,10 +62,10 @@ src: '1' -> dst: '1a' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 1a: local copied/moved to 1 -> m - preserving 1a for resolve of 1a + preserving 1a for resolve of 1a updating: 1a 1/1 files (100.00%) picked tool 'internal:merge' for 1a (binary False symlink False) merging 1a and 1 to 1a @@ -86,10 +85,10 @@ src: '1' -> dst: '1a' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 1: remote moved to 1a -> m - preserving 1 for resolve of 1a + preserving 1 for resolve of 1a removing 1 updating: 1 1/1 files (100.00%) picked tool 'internal:merge' for 1a (binary False symlink False)
--- a/tests/test-keyword.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-keyword.t Thu Feb 28 14:51:59 2013 +0100 @@ -528,6 +528,7 @@ # HG changeset patch # User User Name <user@example.com> # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 cndiff
--- a/tests/test-largefiles-cache.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-largefiles-cache.t Thu Feb 28 14:51:59 2013 +0100 @@ -40,8 +40,6 @@ adding file changes added 2 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) - caching new largefiles - 0 largefiles cached Update working directory to "tip", which requires largefile("large"), but there is no cache file for it. So, hg must treat it as @@ -83,8 +81,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) - caching new largefiles - 1 largefiles cached #if unix-permissions
--- a/tests/test-largefiles.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-largefiles.t Thu Feb 28 14:51:59 2013 +0100 @@ -883,9 +883,7 @@ adding file changes added 6 changesets with 16 changes to 8 files (run 'hg update' to get a working copy) - caching new largefiles - 3 largefiles cached - 3 additional largefiles cached + 6 additional largefiles cached $ cd .. Rebasing between two repositories does not revert largefiles to old @@ -969,8 +967,6 @@ adding file changes added 1 changesets with 2 changes to 2 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) - caching new largefiles - 0 largefiles cached $ hg rebase Invoking status precommit hook M sub/normal4 @@ -1205,20 +1201,14 @@ checking files 10 files, 10 changesets, 28 total revisions searching 1 changesets for largefiles - changeset 9:598410d3eb9a: sub/large4 missing - (looked for hash e166e74c7303192238d60af5a9c4ce9bef0b7928) + changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) verified existence of 3 revisions of 3 largefiles [1] - introduce corruption and make sure that it is caught when checking content: $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 $ hg verify -q --large --lfc - searching 1 changesets for largefiles - changeset 9:598410d3eb9a: sub/large4: contents differ - ($TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928: (glob) - expected hash e166e74c7303192238d60af5a9c4ce9bef0b7928, - but got 1f19b76d5b3cad1472c87efb42b582c97e040060) - verified contents of 3 revisions of 3 largefiles + changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) [1] - cleanup @@ -1226,37 +1216,17 @@ - verifying all revisions will fail because we didn't clone all largefiles to d: $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 - $ hg verify -q --large --lfa --lfc - searching 10 changesets for largefiles - changeset 0:30d30fe6a5be: large1 missing - (looked for hash 4669e532d5b2c093a78eca010077e708a071bb64) - changeset 0:30d30fe6a5be: sub/large2 missing - (looked for hash 1deebade43c8c498a3c8daddac0244dc55d1331d) - changeset 1:ce8896473775: large1 missing - (looked for hash 5f78770c0e77ba4287ad6ef3071c9bf9c379742f) - changeset 1:ce8896473775: sub/large2: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) - expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, - but got cfef678f24d3e339944138ecdd8fd85ca21d820f) - changeset 3:9e8fbc4bce62: large1: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) - expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, - but got cfef678f24d3e339944138ecdd8fd85ca21d820f) - changeset 4:74c02385b94c: large3: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) - expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, - but got cfef678f24d3e339944138ecdd8fd85ca21d820f) - changeset 4:74c02385b94c: sub/large4: contents differ - ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob) - expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4, - but got cfef678f24d3e339944138ecdd8fd85ca21d820f) - changeset 5:9d5af5072dbd: large3 missing - (looked for hash baaf12afde9d8d67f25dab6dced0d2bf77dba47c) - changeset 5:9d5af5072dbd: sub/large4 missing - (looked for hash aeb2210d19f02886dde00dac279729a48471e2f9) - changeset 6:4355d653f84f: large3 missing - (looked for hash 7838695e10da2bb75ac1156565f40a2595fa2fa0) - verified contents of 15 revisions of 6 largefiles + $ hg verify -q --lfa --lfc + changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob) + changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob) + changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob) + changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) + changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) + changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) + changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) + changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c + changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 + changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 [1] - cleanup @@ -1323,8 +1293,6 @@ pulling from $TESTTMP/d (glob) searching for changes no changes found - caching new largefiles - 0 largefiles cached 0 additional largefiles cached Merging does not revert to old versions of largefiles and also check @@ -1354,7 +1322,8 @@ $ hg commit -m "Modify large4 to test merge" Invoking status precommit hook M sub/large4 - $ hg pull ../e +# Test --cache-largefiles flag + $ hg pull --cache-largefiles ../e pulling from ../e searching for changes adding changesets @@ -1362,7 +1331,7 @@ adding file changes added 2 changesets with 4 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) - caching new largefiles + caching largefiles for 1 heads 2 largefiles cached $ hg merge merging sub/large4 @@ -1730,8 +1699,6 @@ [1] $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/ $ hg -R http-clone -q verify --large --lfa - searching 1 changesets for largefiles - verified existence of 1 revisions of 1 largefiles largefiles pulled on update - a largefile missing on the server: $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 . @@ -1767,11 +1734,11 @@ $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/ $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936 .hglf/f1: remote created -> g + getting .hglf/f1 updating: .hglf/f1 1/1 files (100.00%) - getting .hglf/f1 getting changed largefiles using http://localhost:$HGPORT2/ sending capabilities command
--- a/tests/test-lfconvert.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-lfconvert.t Thu Feb 28 14:51:59 2013 +0100 @@ -317,18 +317,12 @@ checking files 8 files, 7 changesets, 12 total revisions searching 7 changesets for largefiles - changeset 0:d4892ec57ce2: large missing - (looked for hash 2e000fa7e85759c7f4c254d4d9c33ef481e459a7) - changeset 1:334e5237836d: sub/maybelarge.dat missing - (looked for hash 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c) - changeset 2:261ad3f3f037: stuff/maybelarge.dat missing - (looked for hash 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c) - changeset 3:55759520c76f: sub/maybelarge.dat missing - (looked for hash 76236b6a2c6102826c61af4297dd738fb3b1de38) - changeset 5:9cc5aa7204f0: stuff/maybelarge.dat missing - (looked for hash 76236b6a2c6102826c61af4297dd738fb3b1de38) - changeset 6:17126745edfd: anotherlarge missing - (looked for hash 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3) + changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob) + changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob) + changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob) + changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob) + changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob) + changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob) verified existence of 6 revisions of 4 largefiles [1] $ hg -R largefiles-repo-hg showconfig paths
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-lrucachedict.py Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,35 @@ +from mercurial import util + +def printifpresent(d, xs): + for x in xs: + present = x in d + print "'%s' in d: %s" % (x, present) + if present: + print "d['%s']: %s" % (x, d[x]) + +def test_lrucachedict(): + d = util.lrucachedict(4) + d['a'] = 'va' + d['b'] = 'vb' + d['c'] = 'vc' + d['d'] = 'vd' + + # all of these should be present + printifpresent(d, ['a', 'b', 'c', 'd']) + + # 'a' should be dropped because it was least recently used + d['e'] = 've' + printifpresent(d, ['a', 'b', 'c', 'd', 'e']) + + # touch entries in some order (get or set). + d['e'] + d['c'] = 'vc2' + d['d'] + d['b'] = 'vb2' + + # 'e' should be dropped now + d['f'] = 'vf' + printifpresent(d, ['b', 'c', 'd', 'e', 'f']) + +if __name__ == '__main__': + test_lrucachedict()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-lrucachedict.py.out Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,26 @@ +'a' in d: True +d['a']: va +'b' in d: True +d['b']: vb +'c' in d: True +d['c']: vc +'d' in d: True +d['d']: vd +'a' in d: False +'b' in d: True +d['b']: vb +'c' in d: True +d['c']: vc +'d' in d: True +d['d']: vd +'e' in d: True +d['e']: ve +'b' in d: True +d['b']: vb2 +'c' in d: True +d['c']: vc2 +'d' in d: True +d['d']: vd +'e' in d: False +'f' in d: True +d['f']: vf
--- a/tests/test-merge-commit.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-merge-commit.t Thu Feb 28 14:51:59 2013 +0100 @@ -69,10 +69,10 @@ $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 bar: versions differ -> m - preserving bar for resolve of bar + preserving bar for resolve of bar updating: bar 1/1 files (100.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging bar @@ -156,10 +156,10 @@ $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 bar: versions differ -> m - preserving bar for resolve of bar + preserving bar for resolve of bar updating: bar 1/1 files (100.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging bar
--- a/tests/test-merge-prompt.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-merge-prompt.t Thu Feb 28 14:51:59 2013 +0100 @@ -42,7 +42,7 @@ Non-interactive merge: $ hg merge -y - local changed file1 which remote deleted + local changed file1 which remote deleted use (c)hanged version or (d)elete? c remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? c @@ -70,7 +70,7 @@ > c > d > EOF - local changed file1 which remote deleted + local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -97,11 +97,11 @@ > baz > c > EOF - local changed file1 which remote deleted + local changed file1 which remote deleted use (c)hanged version or (d)elete? unrecognized response - local changed file1 which remote deleted + local changed file1 which remote deleted use (c)hanged version or (d)elete? unrecognized response - local changed file1 which remote deleted + local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? unrecognized response remote changed file2 which local deleted @@ -126,7 +126,7 @@ $ hg merge --config ui.interactive=true <<EOF > d > EOF - local changed file1 which remote deleted + local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? abort: response expected [255]
--- a/tests/test-merge-types.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-merge-types.t Thu Feb 28 14:51:59 2013 +0100 @@ -32,10 +32,10 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c a: versions differ -> m - preserving a for resolve of a + preserving a for resolve of a updating: a 1/1 files (100.00%) picked tool 'internal:merge' for a (binary False symlink True) merging a @@ -65,10 +65,10 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f a: versions differ -> m - preserving a for resolve of a + preserving a for resolve of a updating: a 1/1 files (100.00%) picked tool 'internal:merge' for a (binary False symlink True) merging a @@ -99,10 +99,10 @@ $ HGMERGE= hg up -y --debug searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f a: versions differ -> m - preserving a for resolve of a + preserving a for resolve of a updating: a 1/1 files (100.00%) (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) picked tool 'internal:prompt' for a (binary False symlink True)
--- a/tests/test-merge7.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-merge7.t Thu Feb 28 14:51:59 2013 +0100 @@ -81,10 +81,10 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 test.txt: versions differ -> m - preserving test.txt for resolve of test.txt + preserving test.txt for resolve of test.txt updating: test.txt 1/1 files (100.00%) picked tool 'internal:merge' for test.txt (binary False symlink False) merging test.txt
--- a/tests/test-mq.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-mq.t Thu Feb 28 14:51:59 2013 +0100 @@ -1555,4 +1555,24 @@ 1: secret 2: secret +Test that secret mq patch does not break hgweb + + $ cat > hgweb.cgi <<HGWEB + > from mercurial import demandimport; demandimport.enable() + > from mercurial.hgweb import hgweb + > from mercurial.hgweb import wsgicgi + > import cgitb + > cgitb.enable() + > app = hgweb('.', 'test') + > wsgicgi.launch(app) + > HGWEB + $ . "$TESTDIR/cgienv" + $ PATH_INFO=/tags; export PATH_INFO + $ QUERY_STRING='style=raw' + $ python hgweb.cgi | grep -v ETag: + Status: 200 Script output follows\r (esc) + Content-Type: text/plain; charset=ascii\r (esc) + \r (esc) + tip [0-9a-f]{40} (re) + $ cd ..
--- a/tests/test-obsolete-divergent.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-obsolete-divergent.t Thu Feb 28 14:51:59 2013 +0100 @@ -1,6 +1,6 @@ Test file dedicated to testing the divergent troubles from obsolete changeset. -This is the most complexe troubles from far so we isolate it in a dedicated +This is the most complex troubles from far so we isolate it in a dedicated file. Enable obsolete @@ -294,7 +294,7 @@ e442cfc57690 $ hg log -r 'divergent()' -Check more complexe obsolescence graft (with divergence) +Check more complex obsolescence graft (with divergence) $ mkcommit B_0; hg up 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
--- a/tests/test-obsolete.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-obsolete.t Thu Feb 28 14:51:59 2013 +0100 @@ -752,7 +752,7 @@ check that web.view config option: - $ kill `cat hg.pid` + $ "$TESTDIR/killdaemons.py" hg.pid $ cat >> .hg/hgrc << EOF > [web] > view=all @@ -761,7 +761,7 @@ $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/67' 200 Script output follows - $ kill `cat hg.pid` + $ "$TESTDIR/killdaemons.py" hg.pid Checking _enable=False warning if obsolete marker exists
--- a/tests/test-parse-date.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-parse-date.t Thu Feb 28 14:51:59 2013 +0100 @@ -234,3 +234,25 @@ Sat Apr 15 13:30:00 2006 +0000 Wed Feb 01 13:00:30 2006 -0500 Wed Feb 01 13:00:30 2006 +0000 + +Test issue 3764 (interpreting 'today' and 'yesterday') + $ echo "hello" >> a + >>> import datetime + >>> today = datetime.date.today().strftime("%b %d") + >>> yesterday = (datetime.date.today() - datetime.timedelta(days=1)).strftime("%b %d") + >>> dates = open('dates', 'w') + >>> dates.write(today + '\n') + >>> dates.write(yesterday) + >>> dates.close() + $ hg ci -d "`sed -n '1p' dates`" -m "today is a good day to code" + $ hg log -d today --template '{desc}\n' + today is a good day to code + $ echo "goodbye" >> a + $ hg ci -d "`sed -n '2p' dates`" -m "the time traveler's code" + $ hg log -d yesterday --template '{desc}\n' + the time traveler's code + $ echo "foo" >> a + $ hg commit -d now -m 'Explicitly committed now.' + $ hg log -d today --template '{desc}\n' + Explicitly committed now. + today is a good day to code
--- a/tests/test-patchbomb.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-patchbomb.t Thu Feb 28 14:51:59 2013 +0100 @@ -27,6 +27,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -98,6 +99,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -126,6 +128,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -258,6 +261,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f utf-8 content @@ -297,21 +301,23 @@ To: foo Cc: bar - IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgOTA5 - YTAwZTEzZTlkNzhiNTc1YWVlZTIzZGRkYmFkYTQ2ZDVhMTQzZgojIFBhcmVudCAgZmYyYzlmYTIw - MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5Zgp1dGYtOCBjb250ZW50CgpkaWZmIC1yIGZm - MmM5ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgZGVzY3JpcHRpb24KLS0tIC9kZXYvbnVsbAlUaHUg - SmFuIDAxIDAwOjAwOjAwIDE5NzAgKzAwMDAKKysrIGIvZGVzY3JpcHRpb24JVGh1IEphbiAwMSAw - MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMyBAQAorYSBtdWx0aWxpbmUKKworZGVzY3Jp - cHRpb24KZGlmZiAtciBmZjJjOWZhMjAxOGIgLXIgOTA5YTAwZTEzZTlkIHV0ZgotLS0gL2Rldi9u - dWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCArMDAwMAorKysgYi91dGYJVGh1IEphbiAwMSAw - MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMSBAQAoraMO2bW1hIQo= + IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojICAgICAgVGh1IEph + biAwMSAwMDowMDowNCAxOTcwICswMDAwCiMgTm9kZSBJRCA5MDlhMDBlMTNlOWQ3OGI1NzVhZWVl + MjNkZGRiYWRhNDZkNWExNDNmCiMgUGFyZW50ICBmZjJjOWZhMjAxOGIxNWZhNzRiMzMzNjNiZGE5 + NTI3MzIzZTJhOTlmCnV0Zi04IGNvbnRlbnQKCmRpZmYgLXIgZmYyYzlmYTIwMThiIC1yIDkwOWEw + MGUxM2U5ZCBkZXNjcmlwdGlvbgotLS0gL2Rldi9udWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3 + MCArMDAwMAorKysgYi9kZXNjcmlwdGlvbglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK + QEAgLTAsMCArMSwzIEBACithIG11bHRpbGluZQorCitkZXNjcmlwdGlvbgpkaWZmIC1yIGZmMmM5 + ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDow + MDowMCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK + QEAgLTAsMCArMSwxIEBACitow7ZtbWEhCg== $ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")' # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f utf-8 content @@ -357,6 +363,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -407,6 +414,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -465,6 +473,7 @@ # HG changeset patch # User test # Date 5 0 + # Thu Jan 01 00:00:05 1970 +0000 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 isolatin 8-bit encoding @@ -513,6 +522,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -590,6 +600,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -622,6 +633,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -659,6 +671,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -698,6 +711,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -771,6 +785,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -805,6 +820,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -839,6 +855,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -902,6 +919,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -949,6 +967,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -1002,6 +1021,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1021,6 +1041,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1087,6 +1108,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1130,6 +1152,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1173,6 +1196,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -1241,6 +1265,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1291,6 +1316,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1342,6 +1368,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1370,6 +1397,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1404,6 +1432,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1438,6 +1467,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1480,6 +1510,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1536,6 +1567,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1570,6 +1602,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1607,6 +1640,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e Added tag two, two.diff for changeset ff2c9fa2018b @@ -1646,6 +1680,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1674,6 +1709,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1728,6 +1764,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1756,6 +1793,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1789,6 +1827,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1840,6 +1879,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1868,6 +1908,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1901,6 +1942,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1952,6 +1994,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1980,6 +2023,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -2017,6 +2061,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -2056,6 +2101,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -2144,6 +2190,7 @@ # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -2171,6 +2218,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f utf-8 content @@ -2205,6 +2253,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -2248,6 +2297,7 @@ # HG changeset patch # User test # Date 5 0 + # Thu Jan 01 00:00:05 1970 +0000 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 isolatin 8-bit encoding @@ -2275,6 +2325,7 @@ # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433 # Parent 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 Added tag zero, zero.foo for changeset 8580ff50825a @@ -2303,6 +2354,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Branch test # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 @@ -2338,6 +2390,7 @@ # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Branch test # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
--- a/tests/test-progress.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-progress.t Thu Feb 28 14:51:59 2013 +0100 @@ -167,6 +167,7 @@ $ hg -y loop 8 \r (no-eol) (esc) + loop [====> ] 1/8 1m18s\r (no-eol) (esc) loop [=========> ] 2/8 1m07s\r (no-eol) (esc) loop [===============> ] 3/8 56s\r (no-eol) (esc) loop [=====================> ] 4/8 45s\r (no-eol) (esc) @@ -203,6 +204,7 @@ Time estimates should not fail when there's no end point: $ hg -y loop -- -4 \r (no-eol) (esc) - loop [ <=> ] 2\r (no-eol) (esc) - loop [ <=> ] 3\r (no-eol) (esc) + loop [ <=> ] 1\r (no-eol) (esc) + loop [ <=> ] 2\r (no-eol) (esc) + loop [ <=> ] 3\r (no-eol) (esc) \r (no-eol) (esc)
--- a/tests/test-rebase-collapse.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-rebase-collapse.t Thu Feb 28 14:51:59 2013 +0100 @@ -496,15 +496,15 @@ $ hg ci -Am 'A' adding a - $ hg branch '1' - marked working directory as branch 1 + $ hg branch 'one' + marked working directory as branch one (branches are permanent and global, did you want a bookmark?) $ echo 'b' > b $ hg ci -Am 'B' adding b - $ hg branch '2' - marked working directory as branch 2 + $ hg branch 'two' + marked working directory as branch two (branches are permanent and global, did you want a bookmark?) $ echo 'c' > c $ hg ci -Am 'C' @@ -518,9 +518,9 @@ $ hg tglog @ 3: 'D' | - | o 2: 'C' 2 + | o 2: 'C' two | | - | o 1: 'B' 1 + | o 1: 'B' one |/ o 0: 'A' @@ -546,9 +546,9 @@ |/ o 3: 'D' | - | o 2: 'C' 2 + | o 2: 'C' two | | - | o 1: 'B' 1 + | o 1: 'B' one |/ o 0: 'A' @@ -559,9 +559,9 @@ | o 3: 'D' | - | o 2: 'C' 2 + | o 2: 'C' two | | - | o 1: 'B' 1 + | o 1: 'B' one |/ o 0: 'A' @@ -569,6 +569,7 @@ # HG changeset patch # User user1 # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213 # Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09 E
--- a/tests/test-rebase-mq.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-rebase-mq.t Thu Feb 28 14:51:59 2013 +0100 @@ -102,6 +102,7 @@ # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 P0 @@ -124,6 +125,7 @@ # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent ???????????????????????????????????????? (glob) P1 @@ -209,6 +211,7 @@ # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 P0 (git) @@ -224,6 +227,7 @@ # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent ???????????????????????????????????????? (glob) P1
--- a/tests/test-rebase-scenario-global.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-rebase-scenario-global.t Thu Feb 28 14:51:59 2013 +0100 @@ -564,7 +564,7 @@ $ cd .. -More complexe rebase with multiple roots +More complex rebase with multiple roots each root have a different common ancestor with the destination and this is a detach (setup)
--- a/tests/test-rename-dir-merge.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-rename-dir-merge.t Thu Feb 28 14:51:59 2013 +0100 @@ -37,23 +37,20 @@ discovered dir src: 'a/' -> dst: 'b/' pending file src: 'a/c' -> dst: 'b/c' resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 a/a: other deleted -> r a/b: other deleted -> r a/c: remote renamed directory to b/c -> d b/a: remote created -> g b/b: remote created -> g - updating: a/a 1/5 files (20.00%) removing a/a - updating: a/b 2/5 files (40.00%) removing a/b - updating: a/c 3/5 files (60.00%) + getting b/a + getting b/b + updating: b/b 4/5 files (80.00%) + updating: a/c 5/5 files (100.00%) moving a/c to b/c - updating: b/a 4/5 files (80.00%) - getting b/a - updating: b/b 5/5 files (100.00%) - getting b/b 3 files updated, 0 files merged, 2 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -88,7 +85,7 @@ discovered dir src: 'a/' -> dst: 'b/' pending file src: 'a/c' -> dst: 'b/c' resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb None: local renamed directory to b/c -> d updating:None 1/1 files (100.00%)
--- a/tests/test-rename-merge1.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-rename-merge1.t Thu Feb 28 14:51:59 2013 +0100 @@ -33,25 +33,25 @@ src: 'a2' -> dst: 'b2' ! src: 'a2' -> dst: 'c2' ! checking for directory renames - a2: divergent renames -> dr resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c a: remote moved to b -> m + preserving a for resolve of b + a2: divergent renames -> dr b2: remote created -> g - preserving a for resolve of b removing a - updating: a 1/3 files (33.33%) + getting b2 + updating: b2 1/3 files (33.33%) + updating: a 2/3 files (66.67%) picked tool 'internal:merge' for b (binary False symlink False) merging a and b to b my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c premerge successful - updating: a2 2/3 files (66.67%) + updating: a2 3/3 files (100.00%) note: possible conflict - a2 was renamed multiple times to: c2 b2 - updating: b2 3/3 files (100.00%) - getting b2 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -178,16 +178,16 @@ all copies found (* = to merge, ! = divergent, % = renamed and deleted): src: 'file' -> dst: 'newfile' % checking for directory renames + resolving manifests + branchmerge: True, force: False, partial: False + ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 file: rename and delete -> rd - resolving manifests - overwrite: False, partial: False - ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 newfile: remote created -> g - updating: file 1/2 files (50.00%) + getting newfile + updating: newfile 1/2 files (50.00%) + updating: file 2/2 files (100.00%) note: possible conflict - file was deleted and renamed to: newfile - updating: newfile 2/2 files (100.00%) - getting newfile 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg status
--- a/tests/test-rename-merge2.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-rename-merge2.t Thu Feb 28 14:51:59 2013 +0100 @@ -84,12 +84,12 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 + a: remote copied to b -> m + preserving a for resolve of b rev: versions differ -> m - a: remote copied to b -> m - preserving a for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev updating: a 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) merging a and b to b @@ -119,15 +119,15 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 a: remote is newer -> g b: local copied/moved to a -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev + getting a updating: a 1/3 files (33.33%) - getting a updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) merging b and a to b @@ -157,12 +157,12 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a + a: remote moved to b -> m + preserving a for resolve of b rev: versions differ -> m - a: remote moved to b -> m - preserving a for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev removing a updating: a 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) @@ -192,12 +192,12 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 b: local copied/moved to a -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev updating: b 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) merging b and a to b @@ -226,13 +226,13 @@ src: 'a' -> dst: 'b' checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 - rev: versions differ -> m b: remote created -> g - preserving rev for resolve of rev + rev: versions differ -> m + preserving rev for resolve of rev + getting b updating: b 1/2 files (50.00%) - getting b updating: rev 2/2 files (100.00%) picked tool 'python ../merge' for rev (binary False symlink False) merging rev @@ -256,10 +256,10 @@ src: 'a' -> dst: 'b' checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 rev: versions differ -> m - preserving rev for resolve of rev + preserving rev for resolve of rev updating: rev 1/1 files (100.00%) picked tool 'python ../merge' for rev (binary False symlink False) merging rev @@ -283,16 +283,15 @@ src: 'a' -> dst: 'b' checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a a: other deleted -> r + b: remote created -> g rev: versions differ -> m - b: remote created -> g - preserving rev for resolve of rev - updating: a 1/3 files (33.33%) + preserving rev for resolve of rev removing a + getting b updating: b 2/3 files (66.67%) - getting b updating: rev 3/3 files (100.00%) picked tool 'python ../merge' for rev (binary False symlink False) merging rev @@ -315,10 +314,10 @@ src: 'a' -> dst: 'b' checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 rev: versions differ -> m - preserving rev for resolve of rev + preserving rev for resolve of rev updating: rev 1/1 files (100.00%) picked tool 'python ../merge' for rev (binary False symlink False) merging rev @@ -336,12 +335,12 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev updating: b 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -373,19 +372,19 @@ src: 'a' -> dst: 'b' ! src: 'a' -> dst: 'c' ! checking for directory renames - a: divergent renames -> dr resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e - rev: versions differ -> m + a: divergent renames -> dr c: remote created -> g - preserving rev for resolve of rev - updating: a 1/3 files (33.33%) + rev: versions differ -> m + preserving rev for resolve of rev + getting c + updating: c 1/3 files (33.33%) + updating: a 2/3 files (66.67%) note: possible conflict - a was renamed multiple times to: b c - updating: c 2/3 files (66.67%) - getting c updating: rev 3/3 files (100.00%) picked tool 'python ../merge' for rev (binary False symlink False) merging rev @@ -404,12 +403,12 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev updating: b 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -432,15 +431,15 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a a: other deleted -> r b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev + removing a updating: a 1/3 files (33.33%) - removing a updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -462,15 +461,15 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a a: remote is newer -> g b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev + getting a updating: a 1/3 files (33.33%) - getting a updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -493,15 +492,15 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a a: other deleted -> r b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev + removing a updating: a 1/3 files (33.33%) - removing a updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -523,15 +522,15 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a a: remote is newer -> g b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev + getting a updating: a 1/3 files (33.33%) - getting a updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -554,12 +553,12 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev updating: b 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -582,17 +581,17 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a - b: versions differ -> m - rev: versions differ -> m remote changed a which local deleted use (c)hanged version or leave (d)eleted? c a: prompt recreating -> g - preserving b for resolve of b - preserving rev for resolve of rev + b: versions differ -> m + preserving b for resolve of b + rev: versions differ -> m + preserving rev for resolve of rev + getting a updating: a 1/3 files (33.33%) - getting a updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) merging b @@ -615,15 +614,15 @@ -------------- searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a - local changed a which remote deleted + local changed a which remote deleted use (c)hanged version or (d)elete? c a: prompt keep -> a b: versions differ -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev updating: a 1/3 files (33.33%) updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) @@ -652,12 +651,12 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 + a: remote moved to b -> m + preserving a for resolve of b rev: versions differ -> m - a: remote moved to b -> m - preserving a for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev removing a updating: a 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) @@ -686,12 +685,12 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 b: local copied/moved to a -> m + preserving b for resolve of b rev: versions differ -> m - preserving b for resolve of b - preserving rev for resolve of rev + preserving rev for resolve of rev updating: b 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) merging b and a to b @@ -724,20 +723,20 @@ src: 'a' -> dst: 'b' * checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f b: local copied/moved to a -> m - rev: versions differ -> m + preserving b for resolve of b c: remote created -> g - preserving b for resolve of b - preserving rev for resolve of rev - updating: b 1/3 files (33.33%) + rev: versions differ -> m + preserving rev for resolve of rev + getting c + updating: c 1/3 files (33.33%) + updating: b 2/3 files (66.67%) picked tool 'python ../merge' for b (binary False symlink False) merging b and a to b my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 premerge successful - updating: c 2/3 files (66.67%) - getting c updating: rev 3/3 files (100.00%) picked tool 'python ../merge' for rev (binary False symlink False) merging rev
--- a/tests/test-revset.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-revset.t Thu Feb 28 14:51:59 2013 +0100 @@ -218,17 +218,29 @@ $ log 'date(2005) and 1::' 4 +ancestor can accept 0 or more arguments + + $ log 'ancestor()' $ log 'ancestor(1)' - hg: parse error: ancestor requires two arguments - [255] + 1 $ log 'ancestor(4,5)' 1 $ log 'ancestor(4,5) and 4' + $ log 'ancestor(0,0,1,3)' + 0 + $ log 'ancestor(3,1,5,3,5,1)' + 1 + $ log 'ancestor(0,1,3,5)' + 0 + $ log 'ancestor(1,2,3,4,5)' + 1 $ log 'ancestors(5)' 0 1 3 5 + $ log 'ancestor(ancestors(5))' + 0 $ log 'author(bob)' 2 $ log 'author("re:bob|test")'
--- a/tests/test-serve.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-serve.t Thu Feb 28 14:51:59 2013 +0100 @@ -9,12 +9,7 @@ > cat hg.pid >> "$DAEMON_PIDS" > echo % errors > cat errors.log - > if [ "$KILLQUIETLY" = "Y" ]; then - > kill `cat hg.pid` 2>/dev/null - > else - > kill `cat hg.pid` - > fi - > while kill -0 `cat hg.pid` 2>/dev/null; do sleep 0; done + > "$TESTDIR/killdaemons.py" hg.pid > } $ hg init test
--- a/tests/test-subrepo.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-subrepo.t Thu Feb 28 14:51:59 2013 +0100 @@ -203,20 +203,19 @@ $ hg merge 6 --debug # test change searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 .hgsubstate: versions differ -> m updating: .hgsubstate 1/1 files (100.00%) subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg getting subrepo t - searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a t: remote is newer -> g + getting t updating: t 1/1 files (100.00%) - getting t 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg debugsub @@ -232,7 +231,7 @@ $ HGMERGE=internal:merge hg merge --debug 7 # test conflict searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf .hgsubstate: versions differ -> m updating: .hgsubstate 1/1 files (100.00%) @@ -241,10 +240,10 @@ merging subrepo t searching for copies back to rev 2 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 t: versions differ -> m - preserving t for resolve of t + preserving t for resolve of t updating: t 1/1 files (100.00%) picked tool 'internal:merge' for t (binary False symlink False) merging t @@ -270,9 +269,9 @@ $ cd .. $ hg clone t tc updating to branch default - cloning subrepo s from $TESTTMP/t/s (glob) + cloning subrepo s from $TESTTMP/t/s cloning subrepo s/ss from $TESTTMP/t/s/ss (glob) - cloning subrepo t from $TESTTMP/t/t (glob) + cloning subrepo t from $TESTTMP/t/t 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd tc $ hg debugsub @@ -293,10 +292,10 @@ pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) searching for changes no changes found - pushing subrepo s to $TESTTMP/t/s (glob) + pushing subrepo s to $TESTTMP/t/s searching for changes no changes found - pushing subrepo t to $TESTTMP/t/t (glob) + pushing subrepo t to $TESTTMP/t/t searching for changes adding changesets adding manifests @@ -318,7 +317,7 @@ pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) searching for changes no changes found - pushing subrepo s to $TESTTMP/t/s (glob) + pushing subrepo s to $TESTTMP/t/s searching for changes abort: push creates new remote head 12a213df6fa9! (in subrepo s) (did you forget to merge? use push -f to force) @@ -328,13 +327,13 @@ pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) searching for changes no changes found - pushing subrepo s to $TESTTMP/t/s (glob) + pushing subrepo s to $TESTTMP/t/s searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - pushing subrepo t to $TESTTMP/t/t (glob) + pushing subrepo t to $TESTTMP/t/t searching for changes no changes found searching for changes @@ -367,7 +366,7 @@ should pull t $ hg up - pulling subrepo t from $TESTTMP/t/t (glob) + pulling subrepo t from $TESTTMP/t/t searching for changes adding changesets adding manifests @@ -573,7 +572,7 @@ adding .hgsub $ hg clone repo repo2 updating to branch default - cloning subrepo s from $TESTTMP/repo/s (glob) + cloning subrepo s from $TESTTMP/repo/s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -q -R repo2 pull -u $ echo 1 > repo2/s/a
--- a/tests/test-symlinks.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-symlinks.t Thu Feb 28 14:51:59 2013 +0100 @@ -149,6 +149,10 @@ adding foo/a $ mv foo bar $ ln -s bar foo + $ hg status + ! foo/a + ? bar/a + ? foo now addremove should remove old files
--- a/tests/test-up-local-change.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-up-local-change.t Thu Feb 28 14:51:59 2013 +0100 @@ -44,17 +44,17 @@ unmatched files in other: b resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb a: versions differ -> m + preserving a for resolve of a b: remote created -> g - preserving a for resolve of a - updating: a 1/2 files (50.00%) + getting b + updating: b 1/2 files (50.00%) + updating: a 2/2 files (100.00%) picked tool 'true' for a (binary False symlink False) merging a my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a - updating: b 2/2 files (100.00%) - getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg parents changeset: 1:1e71731e6fbb @@ -65,13 +65,13 @@ $ hg --debug up 0 resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a - a: versions differ -> m b: other deleted -> r - preserving a for resolve of a + a: versions differ -> m + preserving a for resolve of a + removing b updating: b 1/2 files (50.00%) - removing b updating: a 2/2 files (100.00%) picked tool 'true' for a (binary False symlink False) merging a @@ -98,17 +98,17 @@ unmatched files in other: b resolving manifests - overwrite: False, partial: False + branchmerge: False, force: False, partial: False ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb a: versions differ -> m + preserving a for resolve of a b: remote created -> g - preserving a for resolve of a - updating: a 1/2 files (50.00%) + getting b + updating: b 1/2 files (50.00%) + updating: a 2/2 files (100.00%) picked tool 'true' for a (binary False symlink False) merging a my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a - updating: b 2/2 files (100.00%) - getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg parents changeset: 1:1e71731e6fbb @@ -176,12 +176,12 @@ $ hg --debug merge -f searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False + branchmerge: True, force: True, partial: False ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 a: versions differ -> m + preserving a for resolve of a b: versions differ -> m - preserving a for resolve of a - preserving b for resolve of b + preserving b for resolve of b updating: a 1/2 files (50.00%) picked tool 'true' for a (binary False symlink False) merging a
--- a/tests/test-update-reverse.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-update-reverse.t Thu Feb 28 14:51:59 2013 +0100 @@ -66,17 +66,15 @@ $ hg update --debug -C 1 resolving manifests - overwrite: True, partial: False + branchmerge: False, force: True, partial: False ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf side1: other deleted -> r side2: other deleted -> r main: remote created -> g - updating: side1 1/3 files (33.33%) removing side1 - updating: side2 2/3 files (66.67%) removing side2 + getting main updating: main 3/3 files (100.00%) - getting main 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ ls
--- a/tests/test-walk.t Thu Feb 28 13:55:00 2013 +0100 +++ b/tests/test-walk.t Thu Feb 28 14:51:59 2013 +0100 @@ -155,7 +155,7 @@ abort: path 'mammals/.hg' is inside nested repo 'mammals' (glob) [255] $ hg debugwalk ../.hg - abort: path contains illegal component: .hg (glob) + abort: path contains illegal component: .hg [255] $ cd .. @@ -187,10 +187,10 @@ abort: beans/../.. not under root '$TESTTMP/t' (glob) [255] $ hg debugwalk .hg - abort: path contains illegal component: .hg (glob) + abort: path contains illegal component: .hg [255] $ hg debugwalk beans/../.hg - abort: path contains illegal component: .hg (glob) + abort: path contains illegal component: .hg [255] $ hg debugwalk beans/../.hg/data abort: path contains illegal component: .hg/data (glob)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-websub.t Thu Feb 28 14:51:59 2013 +0100 @@ -0,0 +1,36 @@ + $ "$TESTDIR/hghave" serve || exit 80 + + $ hg init test + $ cd test + + $ cat > .hg/hgrc <<EOF + > [extensions] + > # this is only necessary to check that the mapping from + > # interhg to websub works + > interhg = + > + > [websub] + > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>| + > + > [interhg] + > # check that we maintain some interhg backwards compatibility... + > # yes, 'x' is a weird delimiter... + > markbugs = sxbugx<i class="\x">bug</i>x + > EOF + + $ touch foo + $ hg add foo + $ hg commit -d '1 0' -m 'Issue123: fixed the bug!' + + $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log + $ cat hg.pid >> $DAEMON_PIDS + +log + + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT "rev/tip" | grep bts + <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div> +errors + + $ cat errors.log + + $ cd ..