Mercurial > hg
changeset 23152:b8f6d840d3ec
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 03 Nov 2014 16:56:32 -0600 |
| parents | 733d980b9c59 (diff) 72a89cf86fcd (current diff) |
| children | 9ce22bdcd8bc |
| files | hgext/extdiff.py tests/test-extdiff.t |
| diffstat | 49 files changed, 299 insertions(+), 266 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/Makefile.python Thu Jul 26 11:38:13 2012 +0100 +++ b/contrib/Makefile.python Mon Nov 03 16:56:32 2014 -0600 @@ -1,4 +1,4 @@ -PYTHONVER=2.7.6 +PYTHONVER=2.7.8 PYTHONNAME=python- PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER) SYMLINKDIR=$(HOME)/bin @@ -27,7 +27,7 @@ # debian: apt-get install zlib1g-dev libbz2-dev libssl-dev @echo @echo 'To build a nice collection of interesting Python versions:' - @echo ' $$ for v in 2.{4{,.2,.3},5{,.6},6{,.1,.2,.9},7{,.6}}; do' + @echo ' $$ for v in 2.{4{,.2,.3},5{,.6},6{,.1,.2,.9},7{,.8}}; do' @echo ' make -f Makefile.python symlink PYTHONVER=$$v || break; done' @echo 'To run a Mercurial test on all these Python versions:' @echo ' $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do' @@ -60,7 +60,7 @@ printf 'import sys, zlib, bz2\nif sys.version_info >= (2,6):\n import ssl' | $(PREFIX)/bin/python rm -rf $(PYTHON_SRCDIR) -DOCUTILSVER=0.11 +DOCUTILSVER=0.12 DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER) DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz
--- a/contrib/buildrpm Thu Jul 26 11:38:13 2012 +0100 +++ b/contrib/buildrpm Mon Nov 03 16:56:32 2014 -0600 @@ -18,6 +18,7 @@ --withpython | --with-python) shift PYTHONVER=2.7.8 + PYTHONMD5=d4bca0159acb0b44a781292b5231936f ;; --rpmbuilddir ) shift @@ -76,11 +77,18 @@ cd build PYTHON_SRCFILE=Python-$PYTHONVER.tgz [ -f $PYTHON_SRCFILE ] || curl -Lo $PYTHON_SRCFILE http://www.python.org/ftp/python/$PYTHONVER/$PYTHON_SRCFILE + if [ "$PYTHONMD5" ]; then + echo "$PYTHONMD5 $PYTHON_SRCFILE" | md5sum -w -c + fi ln -f $PYTHON_SRCFILE $RPMBUILDDIR/SOURCES/$PYTHON_SRCFILE DOCUTILSVER=`sed -ne "s/^%global docutilsname docutils-//p" $specfile` DOCUTILS_SRCFILE=docutils-$DOCUTILSVER.tar.gz [ -f $DOCUTILS_SRCFILE ] || curl -Lo $DOCUTILS_SRCFILE http://downloads.sourceforge.net/project/docutils/docutils/$DOCUTILSVER/$DOCUTILS_SRCFILE + DOCUTILSMD5=`sed -ne "s/^%global docutilsmd5 //p" $specfile` + if [ "$DOCUTILSMD5" ]; then + echo "$DOCUTILSMD5 $DOCUTILS_SRCFILE" | md5sum -w -c + fi ln -f $DOCUTILS_SRCFILE $RPMBUILDDIR/SOURCES/$DOCUTILS_SRCFILE ) fi
--- a/contrib/check-code.py Thu Jul 26 11:38:13 2012 +0100 +++ b/contrib/check-code.py Mon Nov 03 16:56:32 2014 -0600 @@ -94,7 +94,7 @@ (r'sed.*-i', "don't use 'sed -i', use a temporary file"), (r'\becho\b.*\\n', "don't use 'echo \\n', use printf"), (r'echo -n', "don't use 'echo -n', use printf"), - (r'(^| )\bwc\b[^|]*$\n(?!.*\(re\))', "filter wc output"), + (r'(^|\|\s*)\bwc\b[^|]*$\n(?!.*\(re\))', "filter wc output"), (r'head -c', "don't use 'head -c', use 'dd'"), (r'tail -n', "don't use the '-n' option to tail, just use '-<num>'"), (r'sha1sum', "don't use sha1sum, use $TESTDIR/md5sum.py"), @@ -291,7 +291,7 @@ "always assign an opened file to a variable, and close it afterwards"), (r'[\s\(](open|file)\([^)]*\)\.', "always assign an opened file to a variable, and close it afterwards"), - (r'(?i)descendent', "the proper spelling is descendAnt"), + (r'(?i)descend[e]nt', "the proper spelling is descendAnt"), (r'\.debug\(\_', "don't mark debug messages for translation"), (r'\.strip\(\)\.split\(\)', "no need to strip before splitting"), (r'^\s*except\s*:', "naked except clause", r'#.*re-raises'),
--- a/contrib/mercurial.spec Thu Jul 26 11:38:13 2012 +0100 +++ b/contrib/mercurial.spec Mon Nov 03 16:56:32 2014 -0600 @@ -6,7 +6,8 @@ %global pythonver %{withpython} %global pythonname Python-%{withpython} -%global docutilsname docutils-0.11 +%global docutilsname docutils-0.12 +%global docutilsmd5 4622263b62c5c771c03502afa3157768 %global pythonhg python-hg %global hgpyprefix /usr/%{pythonhg} # byte compilation will fail on some some Python /test/ files @@ -126,7 +127,6 @@ install -m 644 contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir}/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d -install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc %clean rm -rf $RPM_BUILD_ROOT @@ -149,7 +149,6 @@ %config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh %dir %{_sysconfdir}/mercurial %dir %{_sysconfdir}/mercurial/hgrc.d -%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc %if "%{?withpython}" %{_bindir}/%{pythonhg} %{hgpyprefix}
--- a/contrib/mergetools.hgrc Thu Jul 26 11:38:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ -# Some default global settings for common merge tools - -[merge-tools] -kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output -kdiff3.regkey=Software\KDiff3 -kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 -kdiff3.regappend=\kdiff3.exe -kdiff3.fixeol=True -kdiff3.gui=True -kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child - -gvimdiff.args=--nofork -d -g -O $local $other $base -gvimdiff.regkey=Software\Vim\GVim -gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim -gvimdiff.regname=path -gvimdiff.priority=-9 -gvimdiff.diffargs=--nofork -d -g -O $parent $child - -vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' -vimdiff.check=changed -vimdiff.priority=-10 - -merge.check=conflicts -merge.priority=-100 - -gpyfm.gui=True - -meld.gui=True -meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output -meld.check=changed -meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child - -tkdiff.args=$local $other -a $base -o $output -tkdiff.gui=True -tkdiff.priority=-8 -tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child - -xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other -xxdiff.gui=True -xxdiff.priority=-8 -xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child - -diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ -diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ -diffmerge.regname=Location -diffmerge.priority=-7 -diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output -diffmerge.check=changed -diffmerge.gui=True -diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child - -p4merge.args=$base $local $other $output -p4merge.regkey=Software\Perforce\Environment -p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment -p4merge.regname=P4INSTROOT -p4merge.regappend=\p4merge.exe -p4merge.gui=True -p4merge.priority=-8 -p4merge.diffargs=$parent $child - -p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge -p4mergeosx.args = $base $local $other $output -p4mergeosx.gui = True -p4mergeosx.priority=-8 -p4mergeosx.diffargs=$parent $child - -tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output -tortoisemerge.regkey=Software\TortoiseSVN -tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN -tortoisemerge.check=changed -tortoisemerge.gui=True -tortoisemerge.priority=-8 -tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' - -ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output -ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge -ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge -ecmerge.gui=True -ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' - -# editmerge is a small script shipped in contrib. -# It needs this config otherwise it behaves the same as internal:local -editmerge.args=$output -editmerge.check=changed -editmerge.premerge=keep - -filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge -filemerge.args=-left $other -right $local -ancestor $base -merge $output -filemerge.gui=True - -; Windows version of Beyond Compare -beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo -beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 -beyondcompare3.regname=ExePath -beyondcompare3.gui=True -beyondcompare3.priority=-2 -beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child - -; Linux version of Beyond Compare -bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo -bcompare.gui=True -bcompare.priority=-1 -bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child - -winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output -winmerge.regkey=Software\Thingamahoochie\WinMerge -winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ -winmerge.regname=Executable -winmerge.check=changed -winmerge.gui=True -winmerge.priority=-10 -winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child - -araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR -araxis.regappend=\ConsoleCompare.exe -araxis.priority=-2 -araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output -araxis.checkconflict=True -araxis.binary=True -araxis.gui=True -araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child - -diffuse.priority=-3 -diffuse.args=$local $base $other -diffuse.gui=True -diffuse.diffargs=$parent $child - -UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe -UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe -UltraCompare.args = $base $local $other -title1 base -title3 other -UltraCompare.priority = -2 -UltraCompare.gui = True -UltraCompare.binary = True -UltraCompare.check = conflicts,changed -UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
--- a/contrib/revsetbenchmarks.py Thu Jul 26 11:38:13 2012 +0100 +++ b/contrib/revsetbenchmarks.py Mon Nov 03 16:56:32 2014 -0600 @@ -74,7 +74,7 @@ parser = OptionParser(usage="usage: %prog [options] <revs>") parser.add_option("-f", "--file", - help="read revset from FILE (stdin if omited)", + help="read revset from FILE (stdin if omitted)", metavar="FILE") parser.add_option("-R", "--repo", help="run benchmark on REPO", metavar="REPO")
--- a/contrib/win32/mercurial.iss Thu Jul 26 11:38:13 2012 +0100 +++ b/contrib/win32/mercurial.iss Mon Nov 03 16:56:32 2014 -0600 @@ -67,7 +67,6 @@ Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme -Source: contrib\mergetools.hgrc; DestDir: {tmp}; Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles; Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') @@ -86,6 +85,7 @@ Source: doc\*.html; DestDir: {app}\Docs Source: doc\style.css; DestDir: {app}\Docs Source: mercurial\help\*.txt; DestDir: {app}\help +Source: mercurial\default-hgrc.d\*.rc; DestDir: {app}\default-hgrc.d Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
--- a/contrib/wix/mercurial.wxs Thu Jul 26 11:38:13 2012 +0100 +++ b/contrib/wix/mercurial.wxs Mon Nov 03 16:56:32 2014 -0600 @@ -79,7 +79,7 @@ ReadOnly='yes' KeyPath='yes'/> </Component> <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'> - <File Id='mergetools.rc' Name='MergeTools.rc' Source='contrib\mergetools.hgrc' + <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default-hgrc.d\mergetools.rc' ReadOnly='yes' KeyPath='yes'/> </Component> <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'>
--- a/hgext/extdiff.py Thu Jul 26 11:38:13 2012 +0100 +++ b/hgext/extdiff.py Mon Nov 03 16:56:32 2014 -0600 @@ -23,10 +23,9 @@ #cmd.cdiff = gdiff #opts.cdiff = -Nprc5 - # add new command called vdiff, runs kdiff3 - vdiff = kdiff3 - - # add new command called meld, runs meld (no need to name twice) + # add new command called meld, runs meld (no need to name twice). If + # the meld executable is not available, the meld tool in [merge-tools] + # will be used, if available meld = # add new command called vimdiff, runs gvimdiff with DirDiff plugin @@ -63,7 +62,7 @@ from mercurial.i18n import _ from mercurial.node import short, nullid -from mercurial import cmdutil, scmutil, util, commands, encoding +from mercurial import cmdutil, scmutil, util, commands, encoding, filemerge import os, shlex, shutil, tempfile, re cmdtable = {} @@ -90,7 +89,7 @@ wopener = scmutil.opener(base) fns_and_mtime = [] ctx = repo[node] - for fn in files: + for fn in sorted(files): wfn = util.pconvert(fn) if wfn not in ctx: # File doesn't exist; could be a bogus modify @@ -279,7 +278,9 @@ if cmd.startswith('cmd.'): cmd = cmd[4:] if not path: - path = cmd + path = util.findexe(cmd) + if path is None: + path = filemerge.findexternaltool(ui, cmd) or cmd diffopts = shlex.split(ui.config('extdiff', 'opts.' + cmd, '')) elif cmd.startswith('opts.'): continue @@ -289,7 +290,9 @@ diffopts = shlex.split(path) path = diffopts.pop(0) else: - path, diffopts = cmd, [] + path, diffopts = util.findexe(cmd), [] + if path is None: + path = filemerge.findexternaltool(ui, cmd) or cmd # look for diff arguments in [diff-tools] then [merge-tools] if diffopts == []: args = ui.config('diff-tools', cmd+'.diffargs') or \
--- a/hgext/largefiles/lfcommands.py Thu Jul 26 11:38:13 2012 +0100 +++ b/hgext/largefiles/lfcommands.py Mon Nov 03 16:56:32 2014 -0600 @@ -462,10 +462,10 @@ expecthash != lfutil.hashfile(abslfile))): if lfile not in repo[None]: # not switched to normal file util.unlinkpath(abslfile, ignoremissing=True) - # use normallookup() to allocate entry in largefiles + # use normallookup() to allocate an entry in largefiles # dirstate, because lack of it misleads # lfilesrepo.status() into recognition that such cache - # missing files are REMOVED. + # missing files are removed. lfdirstate.normallookup(lfile) update[lfile] = expecthash else:
--- a/hgext/largefiles/overrides.py Thu Jul 26 11:38:13 2012 +0100 +++ b/hgext/largefiles/overrides.py Mon Nov 03 16:56:32 2014 -0600 @@ -35,7 +35,7 @@ m._fmap = set(m._files) m._always = False origmatchfn = m.matchfn - m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None + m.matchfn = lambda f: notlfile(f) and origmatchfn(f) return m oldmatch = installmatchfn(overridematch) @@ -63,10 +63,10 @@ def restorematchandpatsfn(): '''restores scmutil.matchandpats to what it was before - installnormalfilesmatchandpatsfn was called. no-op if scmutil.matchandpats + installmatchandpatsfn was called. No-op if scmutil.matchandpats is its original function. - Note that n calls to installnormalfilesmatchandpatsfn will require n calls + Note that n calls to installmatchandpatsfn will require n calls to restore matchfn to reverse''' scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats', scmutil.matchandpats) @@ -576,7 +576,6 @@ lfile = lambda f: lfutil.standin(f) in manifest m._files = [lfutil.standin(f) for f in m._files if lfile(f)] m._fmap = set(m._files) - m._always = False origmatchfn = m.matchfn m.matchfn = lambda f: (lfutil.isstandin(f) and (f in manifest) and @@ -684,7 +683,6 @@ m._files = [tostandin(f) for f in m._files] m._files = [f for f in m._files if f is not None] m._fmap = set(m._files) - m._always = False origmatchfn = m.matchfn def matchfn(f): if lfutil.isstandin(f):
--- a/hgext/largefiles/reposetup.py Thu Jul 26 11:38:13 2012 +0100 +++ b/hgext/largefiles/reposetup.py Mon Nov 03 16:56:32 2014 -0600 @@ -102,12 +102,12 @@ except error.LockError: pass - # First check if there were files specified on the - # command line. If there were, and none of them were + # First check if paths or patterns were specified on the + # command line. If there were, and they don't match any # largefiles, we should just bail here and let super # handle it -- thus gaining a big performance boost. lfdirstate = lfutil.openlfdirstate(ui, self) - if match.files() and not match.anypats(): + if not match.always(): for f in lfdirstate: if match(f): break @@ -263,7 +263,7 @@ # and so on), this code path is used to avoid: # (1) updating standins, because standins should # be already updated at this point - # (2) aborting when stadnins are matched by "match", + # (2) aborting when standins are matched by "match", # because automated committing may specify them directly # if getattr(self, "_isrebasing", False) or \ @@ -284,8 +284,7 @@ # Case 1: user calls commit with no specific files or # include/exclude patterns: refresh and commit all files that # are "dirty". - if ((match is None) or - (not match.anypats() and not match.files())): + if match is None or match.always(): # Spend a bit of time here to get a list of files we know # are modified so we can compare only against those. # It can cost a lot of time (several seconds)
--- a/hgext/rebase.py Thu Jul 26 11:38:13 2012 +0100 +++ b/hgext/rebase.py Mon Nov 03 16:56:32 2014 -0600 @@ -278,7 +278,7 @@ commonanc, base, commonanc) if not rebaseset: # transform to list because smartsets are not comparable to - # lists. This should be improved to honor lazyness of + # lists. This should be improved to honor laziness of # smartset. if list(base) == [dest.rev()]: if basef:
--- a/hgext/strip.py Thu Jul 26 11:38:13 2012 +0100 +++ b/hgext/strip.py Mon Nov 03 16:56:32 2014 -0600 @@ -1,4 +1,4 @@ -"""strip changesets and their descendents from history +"""strip changesets and their descendants from history This extension allows you to strip changesets and all their descendants from the repository. See the command help for details.
--- a/i18n/polib.py Thu Jul 26 11:38:13 2012 +0100 +++ b/i18n/polib.py Mon Nov 03 16:56:32 2014 -0600 @@ -396,7 +396,7 @@ def ordered_metadata(self): """ Convenience method that returns an ordered version of the metadata - dictionnary. The return value is list of tuples (metadata name, + dictionary. The return value is list of tuples (metadata name, metadata_value). """ # copy the dict first
--- a/mercurial/bundle2.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/bundle2.py Mon Nov 03 16:56:32 2014 -0600 @@ -229,7 +229,7 @@ self.getreplies(inreplyto).add(category, entry) def getreplies(self, partid): - """get the subrecords that replies to a specific part""" + """get the records that are replies to a specific part""" return self._replies.setdefault(partid, unbundlerecords()) def __getitem__(self, cat): @@ -303,7 +303,7 @@ # consume the bundle content part.read() # Small hack to let caller code distinguish exceptions from bundle2 - # processing fron the ones from bundle1 processing. This is mostly + # processing from processing the old format. This is mostly # needed to handle different return codes to unbundle according to the # type of bundle. We should probably clean up or drop this return code # craziness in a future version. @@ -359,7 +359,7 @@ def decodecaps(blob): - """decode a bundle2 caps bytes blob into a dictionnary + """decode a bundle2 caps bytes blob into a dictionary The blob is a list of capabilities (one per line) Capabilities may have values using a line of the form:: @@ -741,7 +741,7 @@ self.ui.debug('bundle2 stream interruption, looking for a part.\n') headerblock = self._readpartheader() if headerblock is None: - self.ui.debug('no part found during iterruption.\n') + self.ui.debug('no part found during interruption.\n') return part = unbundlepart(self.ui, headerblock, self._fp) op = interruptoperation(self.ui) @@ -828,7 +828,7 @@ # split mandatory from advisory mansizes = paramsizes[:mancount] advsizes = paramsizes[mancount:] - # retrive param value + # retrieve param value manparams = [] for key, value in mansizes: manparams.append((self._fromheader(key), self._fromheader(value))) @@ -888,7 +888,7 @@ return caps def bundle2caps(remote): - """return the bundlecapabilities of a peer as dict""" + """return the bundle capabilities of a peer as dict""" raw = remote.capable('bundle2-exp') if not raw and raw != '': return {} @@ -920,7 +920,7 @@ ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2') op.records.add('changegroup', {'return': ret}) if op.reply is not None: - # This is definitly not the final form of this + # This is definitely not the final form of this # return. But one need to start somewhere. part = op.reply.newpart('b2x:reply:changegroup') part.addparam('in-reply-to', str(inpart.id), mandatory=False) @@ -989,7 +989,7 @@ ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2') op.records.add('changegroup', {'return': ret}) if op.reply is not None: - # This is definitly not the final form of this + # This is definitely not the final form of this # return. But one need to start somewhere. part = op.reply.newpart('b2x:reply:changegroup') part.addparam('in-reply-to', str(inpart.id), mandatory=False)
--- a/mercurial/cmdutil.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/cmdutil.py Mon Nov 03 16:56:32 2014 -0600 @@ -113,7 +113,7 @@ def mergeeditform(ctxorbool, baseform): """build appropriate editform from ctxorbool and baseform - 'cxtorbool' is one of a ctx to be committed, or a bool whether + 'ctxorbool' is one of a ctx to be committed, or a bool whether merging is committed. This returns editform 'baseform' with '.merge' if merging is @@ -1783,8 +1783,8 @@ # If we're forced to take the slowpath it means we're following # at least one pattern/directory, so don't bother with rename tracking. if follow and not match.always() and not slowpath: - # _makelogfilematcher expects its files argument to be relative to - # the repo root, so use match.files(), not pats. + # _makefollowlogfilematcher expects its files argument to be + # relative to the repo root, so use match.files(), not pats. filematcher = _makefollowlogfilematcher(repo, match.files(), followfirst) else: @@ -2522,11 +2522,11 @@ deladded = _deleted - smf deleted = _deleted - deladded - # We need to account for the state of file in the dirstate + # We need to account for the state of file in the dirstate. # - # Even, when we revert agains something else than parent. this will + # Even, when we revert against something else than parent. This will # slightly alter the behavior of revert (doing back up or not, delete - # or just forget etc) + # or just forget etc). if parent == node: dsmodified = modified dsadded = added
--- a/mercurial/context.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/context.py Mon Nov 03 16:56:32 2014 -0600 @@ -109,7 +109,7 @@ """provide a hook to allow child objects to postprocess status results For example, this allows other contexts, such as workingctx, to filter - suspect symlinks in the case of FAT32 and NTFS filesytems. + suspect symlinks in the case of FAT32 and NTFS filesystems. """ return s @@ -1415,7 +1415,7 @@ def _prestatus(self, other, s, match, listignored, listclean, listunknown): """override the parent hook with a dirstate query - We use this prestatus hook to populate the status with information from + We use this _prestatus hook to populate the status with information from the dirstate. """ # doesn't need to call super; if that changes, be aware that super @@ -1426,9 +1426,9 @@ def _poststatus(self, other, s, match, listignored, listclean, listunknown): """override the parent hook with a filter for suspect symlinks - We use this poststatus hook to filter out symlinks that might have + We use this _poststatus hook to filter out symlinks that might have accidentally ended up with the entire contents of the file they are - susposed to be linking to. + supposed to be linking to. """ s[0] = self._filtersuspectsymlink(s[0]) self._status = scmutil.status(*s) @@ -1693,7 +1693,7 @@ class memfilectx(committablefilectx): """memfilectx represents an in-memory file to commit. - See memctx and commitablefilectx for more details. + See memctx and committablefilectx for more details. """ def __init__(self, repo, path, data, islink=False, isexec=False, copied=None, memctx=None):
--- a/mercurial/copies.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/copies.py Mon Nov 03 16:56:32 2014 -0600 @@ -97,7 +97,7 @@ # |/ # o 0 a0 # - # When findlimit is called, a and b are revs 3 and 0, so limit will be 2, + # When _findlimit is called, a and b are revs 3 and 0, so limit will be 2, # yet the filelog has the copy information in rev 1 and we will not look # back far enough unless we also look at the a and b as candidates. # This only occurs when a is a descendent of b or visa-versa.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/default.d/mergetools.rc Mon Nov 03 16:56:32 2014 -0600 @@ -0,0 +1,135 @@ +# Some default global settings for common merge tools + +[merge-tools] +kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output +kdiff3.regkey=Software\KDiff3 +kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 +kdiff3.regappend=\kdiff3.exe +kdiff3.fixeol=True +kdiff3.gui=True +kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child + +gvimdiff.args=--nofork -d -g -O $local $other $base +gvimdiff.regkey=Software\Vim\GVim +gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim +gvimdiff.regname=path +gvimdiff.priority=-9 +gvimdiff.diffargs=--nofork -d -g -O $parent $child + +vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' +vimdiff.check=changed +vimdiff.priority=-10 + +merge.check=conflicts +merge.priority=-100 + +gpyfm.gui=True + +meld.gui=True +meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output +meld.check=changed +meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child + +tkdiff.args=$local $other -a $base -o $output +tkdiff.gui=True +tkdiff.priority=-8 +tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child + +xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other +xxdiff.gui=True +xxdiff.priority=-8 +xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child + +diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ +diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ +diffmerge.regname=Location +diffmerge.priority=-7 +diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output +diffmerge.check=changed +diffmerge.gui=True +diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child + +p4merge.args=$base $local $other $output +p4merge.regkey=Software\Perforce\Environment +p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment +p4merge.regname=P4INSTROOT +p4merge.regappend=\p4merge.exe +p4merge.gui=True +p4merge.priority=-8 +p4merge.diffargs=$parent $child + +p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge +p4mergeosx.args = $base $local $other $output +p4mergeosx.gui = True +p4mergeosx.priority=-8 +p4mergeosx.diffargs=$parent $child + +tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output +tortoisemerge.regkey=Software\TortoiseSVN +tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN +tortoisemerge.check=changed +tortoisemerge.gui=True +tortoisemerge.priority=-8 +tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' + +ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output +ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge +ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge +ecmerge.gui=True +ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' + +# editmerge is a small script shipped in contrib. +# It needs this config otherwise it behaves the same as internal:local +editmerge.args=$output +editmerge.check=changed +editmerge.premerge=keep + +filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge +filemerge.args=-left $other -right $local -ancestor $base -merge $output +filemerge.gui=True + +; Windows version of Beyond Compare +beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo +beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 +beyondcompare3.regname=ExePath +beyondcompare3.gui=True +beyondcompare3.priority=-2 +beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child + +; Linux version of Beyond Compare +bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo +bcompare.gui=True +bcompare.priority=-1 +bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child + +winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output +winmerge.regkey=Software\Thingamahoochie\WinMerge +winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ +winmerge.regname=Executable +winmerge.check=changed +winmerge.gui=True +winmerge.priority=-10 +winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child + +araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR +araxis.regappend=\ConsoleCompare.exe +araxis.priority=-2 +araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output +araxis.checkconflict=True +araxis.binary=True +araxis.gui=True +araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child + +diffuse.priority=-3 +diffuse.args=$local $base $other +diffuse.gui=True +diffuse.diffargs=$parent $child + +UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe +UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe +UltraCompare.args = $base $local $other -title1 base -title3 other +UltraCompare.priority = -2 +UltraCompare.gui = True +UltraCompare.binary = True +UltraCompare.check = conflicts,changed +UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
--- a/mercurial/exchange.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/exchange.py Mon Nov 03 16:56:32 2014 -0600 @@ -298,7 +298,7 @@ else: # adds changeset we are going to push as draft # - # should not be necessary for pushblishing server, but because of an + # should not be necessary for publishing server, but because of an # issue fixed in xxxxx we have to do it anyway. fdroots = list(unfi.set('roots(%ln + %ln::)', outgoing.missing, droots)) @@ -448,7 +448,7 @@ cg = changegroup.getlocalchangegroup(pushop.repo, 'push', pushop.outgoing) cgpart = bundler.newpart('B2X:CHANGEGROUP', data=cg.getchunks()) def handlereply(op): - """extract addchangroup returns from server reply""" + """extract addchangegroup returns from server reply""" cgreplies = op.records.getreplies(cgpart.id) assert len(cgreplies['changegroup']) == 1 pushop.cgresult = cgreplies['changegroup'][0]['return'] @@ -702,7 +702,7 @@ pushop.ui.warn(msg) else: - # fallback to independant pushkey command + # fallback to independent pushkey command for newremotehead in outdated: r = pushop.remote.pushkey('phases', newremotehead.hex(),
--- a/mercurial/filemerge.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/filemerge.py Mon Nov 03 16:56:32 2014 -0600 @@ -37,6 +37,9 @@ def _findtool(ui, tool): if tool in internals: return tool + return findexternaltool(ui, tool) + +def findexternaltool(ui, tool): for kn in ("regkey", "regkeyalt"): k = _toolstr(ui, tool, kn) if not k:
--- a/mercurial/help/config.txt Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/help/config.txt Mon Nov 03 16:56:32 2014 -0600 @@ -38,6 +38,7 @@ - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) - ``/etc/mercurial/hgrc`` (per-system) - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) + - ``<internal>/default.d/*.rc`` (defaults) .. container:: verbose.windows @@ -51,6 +52,7 @@ - ``<install-dir>\Mercurial.ini`` (per-installation) - ``<install-dir>\hgrc.d\*.rc`` (per-installation) - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) + - ``<internal>/default.d/*.rc`` (defaults) .. note:: @@ -67,6 +69,7 @@ - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) - ``/lib/mercurial/hgrc`` (per-system) - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) + - ``<internal>/default.d/*.rc`` (defaults) Per-repository configuration options only apply in a particular repository. This file is not version-controlled, and @@ -102,6 +105,13 @@ executed by any user in any directory. Options in these files override per-installation options. +Mercurial comes with some default configuration. The default configuration +files are installed with Mercurial and will be overwritten on upgrades. Default +configuration files should never be edited by users or administrators but can +be overridden in other configuration files. So far the directory only contains +merge tool configuration but packagers can also put other default configuration +there. + Syntax ======
--- a/mercurial/hg.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/hg.py Mon Nov 03 16:56:32 2014 -0600 @@ -390,7 +390,7 @@ dstcachedir = os.path.join(destpath, 'cache') # In local clones we're copying all nodes, not just served - # ones. Therefore copy all branchcaches over. + # ones. Therefore copy all branch caches over. copybranchcache('branch2') for cachename in repoview.filtertable: copybranchcache('branch2-%s' % cachename)
--- a/mercurial/pathutil.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/pathutil.py Mon Nov 03 16:56:32 2014 -0600 @@ -146,7 +146,7 @@ def normasprefix(path): '''normalize the specified path as path prefix - Returned vaule can be used safely for "p.startswith(prefix)", + Returned value can be used safely for "p.startswith(prefix)", "p[len(prefix):]", and so on. For efficiency, this expects "path" argument to be already
--- a/mercurial/revset.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/revset.py Mon Nov 03 16:56:32 2014 -0600 @@ -2551,7 +2551,7 @@ return it() def _trysetasclist(self): - """populate the _asclist attribut if possible and necessary""" + """populate the _asclist attribute if possible and necessary""" if self._genlist is not None and self._asclist is None: self._asclist = sorted(self._genlist) @@ -2744,7 +2744,7 @@ # We have to use this complex iteration strategy to allow multiple # iterations at the same time. We need to be able to catch revision - # removed from `consumegen` and added to genlist in another instance. + # removed from _consumegen and added to genlist in another instance. # # Getting rid of it would provide an about 15% speed up on this # iteration. @@ -2939,17 +2939,15 @@ class fullreposet(_spanset): """a set containing all revisions in the repo - This class exists to host special optimisation. + This class exists to host special optimization. """ def __init__(self, repo): super(fullreposet, self).__init__(repo) def __and__(self, other): - """fullrepo & other -> other - - As self contains the whole repo, all of the other set should also be in - self. Therefor `self & other = other`. + """As self contains the whole repo, all of the other set should also be + in self. Therefore `self & other = other`. This boldly assumes the other contains valid revs only. """
--- a/mercurial/scmutil.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/scmutil.py Mon Nov 03 16:56:32 2014 -0600 @@ -495,7 +495,13 @@ def osrcpath(): '''return default os-specific hgrc search path''' - path = systemrcpath() + path = [] + defaultpath = os.path.join(util.datapath, 'default.d') + if os.path.isdir(defaultpath): + for f, kind in osutil.listdir(defaultpath): + if f.endswith('.rc'): + path.append(os.path.join(defaultpath, f)) + path.extend(systemrcpath()) path.extend(userrcpath()) path = [os.path.normpath(f) for f in path] return path
--- a/mercurial/tagmerge.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/tagmerge.py Mon Nov 03 16:56:32 2014 -0600 @@ -39,7 +39,7 @@ # and between base and p2, possibly on separate clones # 4. for each tag found both on p1 and p2 perform the following merge algorithm: # - the tags conflict if their tag "histories" have the same "rank" (i.e. -# length) _AND_ the last (current) tag is _NOT_ the same +# length) AND the last (current) tag is NOT the same # - for non conflicting tags: # - choose which are the high and the low ranking nodes # - the high ranking list of nodes is the one that is longer. @@ -57,7 +57,7 @@ # 5. write the merged tags taking into account to their positions in the first # parent (i.e. try to keep the relative ordering of the nodes that come # from p1). This minimizes the diff between the merged and the p1 tag files -# This is donw by using the following algorithm +# This is done by using the following algorithm # - group the nodes for a given tag that must be written next to each other # - A: nodes that come from consecutive lines on p1 # - B: nodes that come from p2 (i.e. whose associated line number is @@ -81,9 +81,9 @@ def readtagsformerge(ui, repo, lines, fn='', keeplinenums=False): '''read the .hgtags file into a structure that is suitable for merging - Sepending on the keeplinenumbers flag, clear the line numbers associated - with each tag. Rhis is done because only the line numbers of the first - parent are useful for merging + Depending on the keeplinenums flag, clear the line numbers associated + with each tag. This is done because only the line numbers of the first + parent are useful for merging. ''' filetags = tagsmod._readtaghist(ui, repo, lines, fn=fn, recode=None, calcnodelines=True)[1]
--- a/mercurial/tags.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/tags.py Mon Nov 03 16:56:32 2014 -0600 @@ -87,7 +87,7 @@ def _readtaghist(ui, repo, lines, fn, recode=None, calcnodelines=False): '''Read tag definitions from a file (or any source of lines). This function returns two sortdicts with similar information: - - the first dict, bingtaglist, contains the tag information as expected by + - the first dict, bintaghist, contains the tag information as expected by the _readtags function, i.e. a mapping from tag name to (node, hist): - node is the node id from the last line read for that name, - hist is the list of node ids previously associated with it (in file
--- a/mercurial/ui.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/ui.py Mon Nov 03 16:56:32 2014 -0600 @@ -537,7 +537,7 @@ return path or loc def pushbuffer(self, error=False): - """install a buffer to capture standar output of the ui object + """install a buffer to capture standard output of the ui object If error is True, the error output will be captured too.""" self._buffers.append([])
--- a/mercurial/util.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/util.py Mon Nov 03 16:56:32 2014 -0600 @@ -1148,7 +1148,7 @@ """Read L bytes of data from the iterator of chunks of data. Returns less than L bytes if the iterator runs dry. - If size parameter is ommited, read everything""" + If size parameter is omitted, read everything""" left = l buf = [] queue = self._queue
--- a/mercurial/wireproto.py Thu Jul 26 11:38:13 2012 +0100 +++ b/mercurial/wireproto.py Mon Nov 03 16:56:32 2014 -0600 @@ -827,7 +827,7 @@ r = exchange.unbundle(repo, gen, their_heads, 'serve', proto._client()) if util.safehasattr(r, 'addpart'): - # The return looks streameable, we are in the bundle2 case and + # The return looks streamable, we are in the bundle2 case and # should return a stream. return streamres(r.getchunks()) return pushres(r)
--- a/setup.py Thu Jul 26 11:38:13 2012 +0100 +++ b/setup.py Mon Nov 03 16:56:32 2014 -0600 @@ -517,6 +517,7 @@ packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', 'help/*.txt', + 'default.d/*.rc', 'dummycert.pem']} def ordinarypath(p):
--- a/tests/dumbhttp.py Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/dumbhttp.py Mon Nov 03 16:56:32 2014 -0600 @@ -5,15 +5,18 @@ """ from optparse import OptionParser -import BaseHTTPServer, SimpleHTTPServer, os, signal, subprocess, sys +import BaseHTTPServer, SimpleHTTPServer, signal, sys +from mercurial import cmdutil -def run(server_class=BaseHTTPServer.HTTPServer, - handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler, - server_address=('localhost', 8000)): - httpd = server_class(server_address, handler_class) - httpd.serve_forever() - +class simplehttpservice(object): + def __init__(self, host, port): + self.address = (host, port) + def init(self): + self.httpd = BaseHTTPServer.HTTPServer( + self.address, SimpleHTTPServer.SimpleHTTPRequestHandler) + def run(self): + self.httpd.serve_forever() if __name__ == '__main__': parser = OptionParser() @@ -26,6 +29,7 @@ parser.add_option('-f', '--foreground', dest='foreground', action='store_true', help='do not start the HTTP server in the background') + parser.add_option('--daemon-pipefds') (options, args) = parser.parse_args() @@ -34,21 +38,9 @@ if options.foreground and options.pid: parser.error("options --pid and --foreground are mutually exclusive") - if options.foreground: - run(server_address=(options.host, options.port)) - else: - # This doesn't attempt to cleanly detach the process, as it's not - # meant to be a long-lived, independent process. As a consequence, - # it's still part of the same process group, and keeps any file - # descriptors it might have inherited besided stdin/stdout/stderr. - # Trying to do things cleanly is more complicated, requires - # OS-dependent code, and is not worth the effort. - proc = subprocess.Popen([sys.executable, __file__, '-f', - '-H', options.host, '-p', str(options.port)], - stdin=open(os.devnull, 'r'), - stdout=open(os.devnull, 'w'), - stderr=subprocess.STDOUT) - if options.pid: - fp = file(options.pid, 'wb') - fp.write(str(proc.pid) + '\n') - fp.close() + opts = {'pid_file': options.pid, + 'daemon': not options.foreground, + 'daemon_pipefds': options.daemon_pipefds} + service = simplehttpservice(options.host, options.port) + cmdutil.service(opts, initfn=service.init, runfn=service.run, + runargs=[sys.executable, __file__] + sys.argv[1:])
--- a/tests/run-tests.py Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/run-tests.py Mon Nov 03 16:56:32 2014 -0600 @@ -500,7 +500,7 @@ except self.failureException, e: # This differs from unittest in that we don't capture # the stack trace. This is for historical reasons and - # this decision could be revisted in the future, + # this decision could be revisited in the future, # especially for PythonTest instances. if result.addFailure(self, str(e)): success = True @@ -1263,7 +1263,7 @@ iolock.release() class TestSuite(unittest.TestSuite): - """Custom unitest TestSuite that knows how to execute Mercurial tests.""" + """Custom unittest TestSuite that knows how to execute Mercurial tests.""" def __init__(self, testdir, jobs=1, whitelist=None, blacklist=None, retest=False, keywords=None, loop=False, @@ -1895,8 +1895,8 @@ the one we expect it to be. If not, print a warning to stderr.""" if ((self._bindir == self._pythondir) and (self._bindir != self._tmpbindir)): - # The pythondir has been infered from --with-hg flag. - # We cannot expect anything sensible here + # The pythondir has been inferred from --with-hg flag. + # We cannot expect anything sensible here. return expecthg = os.path.join(self._pythondir, 'mercurial') actualhg = self._gethgpath()
--- a/tests/test-bundle2-format.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-bundle2-format.t Mon Nov 03 16:56:32 2014 -0600 @@ -1,4 +1,4 @@ -This test is decicated to test the bundle2 container format +This test is dedicated to test the bundle2 container format It test multiple existing parts to test different feature of the container. You probably do not need to touch this test unless you change the binary encoding
--- a/tests/test-check-code.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-check-code.t Mon Nov 03 16:56:32 2014 -0600 @@ -261,7 +261,7 @@ > print _("concatenating " " by " " space %s" % v) > print _("concatenating " + " by " + " '+' %s" % v) > - > print _("maping operation in different line %s" + > print _("mapping operation in different line %s" > % v) > > print _( @@ -278,7 +278,7 @@ > print _("concatenating " + " by " + " '+' %s" % v) don't use % inside _() ./map-inside-gettext.py:6: - > print _("maping operation in different line %s" + > print _("mapping operation in different line %s" don't use % inside _() ./map-inside-gettext.py:9: > print _(
--- a/tests/test-commit-amend.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-commit-amend.t Mon Nov 03 16:56:32 2014 -0600 @@ -889,9 +889,9 @@ The way mercurial does amends is to create a temporary commit (rev 3) and then fold the new and old commits together into another commit (rev 4). During this -process, findlimit is called to check how far back to look for the transitive +process, _findlimit is called to check how far back to look for the transitive closure of file copy information, but due to the divergence of the filelog -and changelog graph topologies, before findlimit was fixed, it returned a rev +and changelog graph topologies, before _findlimit was fixed, it returned a rev which was not far enough back in this case. $ hg mv a1 a2 $ hg status --copies --rev 0
--- a/tests/test-extdiff.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-extdiff.t Mon Nov 03 16:56:32 2014 -0600 @@ -190,6 +190,26 @@ */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) [1] +Fallback to merge-tools.tool.executable|regkey + $ mkdir dir + $ cat > 'dir/tool.sh' << EOF + > #!/bin/sh + > echo "** custom diff **" + > EOF + $ chmod +x dir/tool.sh + $ tool=`pwd`/dir/tool.sh + $ hg --debug tl --config extdiff.tl= --config merge-tools.tl.executable=$tool + making snapshot of 2 files from rev * (glob) + a + b + making snapshot of 2 files from working directory + a + b + running "'$TESTTMP/a/dir/tool.sh' 'a.*' 'a'" in */extdiff.* (glob) + ** custom diff ** + cleaning up temp directory + [1] + $ cd .. #endif
--- a/tests/test-extension.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-extension.t Mon Nov 03 16:56:32 2014 -0600 @@ -424,10 +424,9 @@ #cmd.cdiff = gdiff #opts.cdiff = -Nprc5 - # add new command called vdiff, runs kdiff3 - vdiff = kdiff3 - - # add new command called meld, runs meld (no need to name twice) + # add new command called meld, runs meld (no need to name twice). If + # the meld executable is not available, the meld tool in [merge-tools] + # will be used, if available meld = # add new command called vimdiff, runs gvimdiff with DirDiff plugin
--- a/tests/test-help.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-help.t Mon Nov 03 16:56:32 2014 -0600 @@ -272,7 +272,7 @@ schemes extend schemes with shortcuts to repository swarms share share a common history between several working directories shelve save and restore changes to the working directory - strip strip changesets and their descendents from history + strip strip changesets and their descendants from history transplant command to transplant changesets from another branch win32mbcs allow the use of MBCS paths with problematic encodings zeroconf discover and advertise repositories on the local network
--- a/tests/test-largefiles-misc.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-largefiles-misc.t Mon Nov 03 16:56:32 2014 -0600 @@ -589,7 +589,7 @@ 89e6c98d92887913cadf06b2adb97f26cde4849b -Pusing revision #1 causes uploading entity 89e6c98d9288, which is +Pushing revision #1 causes uploading entity 89e6c98d9288, which is shared also by largefiles b1, b2 in revision #2 and b in revision #5. Then, entity 89e6c98d9288 is not treated as "outgoing entity" at "hg
--- a/tests/test-largefiles-wireproto.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-largefiles-wireproto.t Mon Nov 03 16:56:32 2014 -0600 @@ -1,5 +1,5 @@ -This file contains testcases that tend to be related to the wireprotocol part of -largefile. +This file contains testcases that tend to be related to the wire protocol part +of largefiles. $ USERCACHE="$TESTTMP/cache"; export USERCACHE $ mkdir "${USERCACHE}"
--- a/tests/test-mq-guards.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-mq-guards.t Mon Nov 03 16:56:32 2014 -0600 @@ -568,7 +568,7 @@ 3 G b.patch test that "qselect --reapply" checks applied patches correctly when no -applied patche becomes guarded but some of unapplied ones become +applied patches becomes guarded but some of unapplied ones become unguarded. $ hg qpop -q -a
--- a/tests/test-mq.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-mq.t Mon Nov 03 16:56:32 2014 -0600 @@ -1582,7 +1582,7 @@ $ cd .. -Test interraction with revset (issue4426) +Test interaction with revset (issue4426) $ hg init issue4426 $ cd issue4426
--- a/tests/test-phases-exchange.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-phases-exchange.t Mon Nov 03 16:56:32 2014 -0600 @@ -755,7 +755,7 @@ Bare push with next changeset and common changeset needing sync (issue3575) -(reset some stat on remot repo to not confused other test) +(reset some stat on remote repo to avoid confusing other tests) $ hg -R ../alpha --config extensions.strip= strip --no-backup 967b449fbc94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-progress.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-progress.t Mon Nov 03 16:56:32 2014 -0600 @@ -296,7 +296,7 @@ \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 [=====> ]\r (no-eol) (esc) \r (no-eol) (esc) -test triming progress items, when they contain multi-byte characters, +test trimming progress items, when they contain multi-byte characters, of which length of byte sequence and columns in display are different from each other.
--- a/tests/test-revert.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-revert.t Mon Nov 03 16:56:32 2014 -0600 @@ -400,7 +400,7 @@ This section tests most of the possible combinations of working directory changes and inter-revision changes. The number of possible cases is significant -but they all have a slighly different handling. So this section commits to +but they all have a slightly different handling. So this section commits to generating and testing all of them to allow safe refactoring of the revert code. A python script is used to generate a file history for each combination of @@ -422,9 +422,6 @@ All known states are not tested yet. See inline documentation for details. Special cases from merge and rename are not tested by this section. -There are also multiple cases where the current revert implementation is known to -slightly misbehave. - Write the python script to disk ------------------------------- @@ -733,7 +730,7 @@ Setup working directory - $ python ../gen-revert-cases.py wc | cat + $ python ../gen-revert-cases.py wc $ hg addremove --similarity 0 removing added_removed removing added_revert @@ -1068,7 +1065,7 @@ ### revert for: removed_wc -check resulting directory againt the --all run +check resulting directory against the --all run (There should be no difference) $ python ../dircontent.py > ../content-parent-explicit.txt @@ -1188,7 +1185,7 @@ ### revert for: removed_wc -check resulting directory againt the --all run +check resulting directory against the --all run (There should be no difference) $ python ../dircontent.py > ../content-base-explicit.txt
--- a/tests/test-tag.t Thu Jul 26 11:38:13 2012 +0100 +++ b/tests/test-tag.t Mon Nov 03 16:56:32 2014 -0600 @@ -479,7 +479,7 @@ 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 79505d5360b07e3e79d1052e347e73c02b8afa5b t3 -check that the merge tried to minimize the diff witht he first merge parent +check that the merge tried to minimize the diff with the first merge parent $ hg diff --git -r 'p1()' .hgtags diff --git a/.hgtags b/.hgtags