Mercurial > hg
changeset 7803:6d99ff7b79b5
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 27 Feb 2009 08:13:42 -0600 |
| parents | dd970a311ea8 (current diff) e5627562b9f2 (diff) |
| children | b136c6c5c1c7 |
| files | hgext/convert/cvsps hgext/imerge.py mercurial/localrepo.py mercurial/osutil.py mercurial/version.py |
| diffstat | 220 files changed, 41230 insertions(+), 2368 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Sun Jan 25 19:15:49 2009 +0100 +++ b/.hgignore Fri Feb 27 08:13:42 2009 -0600 @@ -27,6 +27,16 @@ .DS_Store tags cscope.* +i18n/hg.pot +locale/*/LC_MESSAGES/hg.mo + +# files installed with a local --pure build +mercurial/base85.py +mercurial/bdiff.py +mercurial/diffhelpers.py +mercurial/mpatch.py +mercurial/osutil.py +mercurial/parsers.py syntax: regexp ^\.pc/
--- a/Makefile Sun Jan 25 19:15:49 2009 +0100 +++ b/Makefile Fri Feb 27 08:13:42 2009 -0600 @@ -1,6 +1,7 @@ PREFIX=/usr/local export PREFIX PYTHON=python +PURE= help: @echo 'Commonly used make targets:' @@ -13,6 +14,7 @@ @echo ' dist - run all tests and create a source tarball in dist/' @echo ' clean - remove files created by other targets' @echo ' (except installed files or dist source tarball)' + @echo ' update-pot - update i18n/hg.pot' @echo @echo 'Example for a system-wide installation under /usr/local:' @echo ' make all && su -c "make install" && hg version' @@ -23,12 +25,11 @@ all: build doc local: - $(PYTHON) setup.py build_ext -i - $(PYTHON) setup.py build_py -c -d . + $(PYTHON) setup.py $(PURE) build_py -c -d . build_ext -i build_mo $(PYTHON) hg version build: - $(PYTHON) setup.py build + $(PYTHON) setup.py $(PURE) build doc: $(MAKE) -C doc @@ -37,12 +38,13 @@ -$(PYTHON) setup.py clean --all # ignore errors of this command find . -name '*.py[cdo]' -exec rm -f '{}' ';' rm -f MANIFEST mercurial/__version__.py mercurial/*.so tests/*.err + rm -rf locale $(MAKE) -C doc clean install: install-bin install-doc install-bin: build - $(PYTHON) setup.py install --prefix="$(PREFIX)" --force + $(PYTHON) setup.py $(PURE) install --prefix="$(PREFIX)" --force install-doc: doc cd doc && $(MAKE) $(MFLAGS) install @@ -50,7 +52,7 @@ install-home: install-home-bin install-home-doc install-home-bin: build - $(PYTHON) setup.py install --home="$(HOME)" --force + $(PYTHON) setup.py $(PURE) install --home="$(HOME)" --force install-home-doc: doc cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install @@ -74,6 +76,20 @@ test-%: cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@ +update-pot: + mkdir -p i18n + pygettext -d hg -p i18n --docstrings \ + mercurial/commands.py hgext/*.py hgext/*/__init__.py + # All strings marked for translation in Mercurial contain + # ASCII characters only. But some files contain string + # literals like this '\037\213'. xgettext thinks it has to + # parse these them even though they are not marked for + # translation. Extracting with an explicit encoding of + # ISO-8859-1 will make xgettext "parse" and ignore them. + find mercurial hgext doc -name '*.py' | xargs \ + xgettext --from-code ISO-8859-1 --join --sort-by-file \ + -d hg -p i18n -o hg.pot .PHONY: help all local build doc clean install install-bin install-doc \ - install-home install-home-bin install-home-doc dist dist-notests tests + install-home install-home-bin install-home-doc dist dist-notests tests \ + update-pot
--- a/contrib/hgk Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/hgk Fri Feb 27 08:13:42 2009 -0600 @@ -265,6 +265,7 @@ proc parsecommit {id contents listed olds} { global commitinfo children nchildren parents nparents cdate ncleft + global firstparents set inhdr 1 set comment {} @@ -338,6 +339,33 @@ } set commitinfo($id) [list $headline $auname $audate \ $comname $comdate $comment $rev $branch] + + if {[info exists firstparents]} { + set i [lsearch $firstparents $id] + if {$i != -1} { + # remove the parent from firstparents, possible building + # an empty list + set firstparents [concat \ + [lrange $firstparents 0 [expr $i - 1]] \ + [lrange $firstparents [expr $i + 1] end]] + if {$firstparents eq {}} { + # we have found all parents of the first changeset + # which means that we can safely select the first line + after idle { + selectline 0 0 + } + } + } + } else { + # this is the first changeset, save the parents + set firstparents $olds + if {$firstparents eq {}} { + # a repository with a single changeset + after idle { + selectline 0 0 + } + } + } } proc readrefs {} { @@ -439,7 +467,8 @@ global entries sha1entry sha1string sha1but global maincursor textcursor curtextcursor global rowctxmenu gaudydiff mergemax - global hgvdiff + global hgvdiff bgcolor fgcolor diffremcolor diffaddcolor diffmerge1color + global diffmerge2color hunksepcolor menu .bar .bar add cascade -label "File" -menu .bar.file @@ -478,16 +507,16 @@ .ctop add .ctop.top set canv .ctop.top.clist.canv canvas $canv -height $geometry(canvh) -width $geometry(canv1) \ - -bg white -bd 0 \ + -bg $bgcolor -bd 0 \ -yscrollincr $linespc -yscrollcommand "$cscroll set" -selectbackground grey .ctop.top.clist add $canv set canv2 .ctop.top.clist.canv2 canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \ - -bg white -bd 0 -yscrollincr $linespc -selectbackground grey + -bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground grey .ctop.top.clist add $canv2 set canv3 .ctop.top.clist.canv3 canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \ - -bg white -bd 0 -yscrollincr $linespc -selectbackground grey + -bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground grey .ctop.top.clist add $canv3 bind .ctop.top.clist <Configure> {resizeclistpanes %W %w} @@ -547,7 +576,7 @@ .ctop add .ctop.cdet frame .ctop.cdet.left set ctext .ctop.cdet.left.ctext - text $ctext -bg white -state disabled -font $textfont \ + text $ctext -fg $fgcolor -bg $bgcolor -state disabled -font $textfont \ -width $geometry(ctextw) -height $geometry(ctexth) \ -yscrollcommand ".ctop.cdet.left.sb set" \ -xscrollcommand ".ctop.cdet.left.hb set" -wrap none @@ -564,11 +593,16 @@ $ctext tag conf d0 -back "#ff8080" $ctext tag conf d1 -back green } else { - $ctext tag conf hunksep -fore blue - $ctext tag conf d0 -fore red - $ctext tag conf d1 -fore "#00a000" - $ctext tag conf m0 -fore red - $ctext tag conf m1 -fore blue + $ctext tag conf hunksep -fore $hunksepcolor + $ctext tag conf d0 -fore $diffremcolor + $ctext tag conf d1 -fore $diffaddcolor + + # The mX colours seem to be used in merge changesets, where m0 + # is first parent, m1 is second parent and so on. Git can have + # several parents, Hg cannot, so I think the m2..mmax would be + # unused. + $ctext tag conf m0 -fore $diffmerge1color + $ctext tag conf m1 -fore $diffmerge2color $ctext tag conf m2 -fore green $ctext tag conf m3 -fore purple $ctext tag conf m4 -fore brown @@ -581,7 +615,8 @@ frame .ctop.cdet.right set cflist .ctop.cdet.right.cfiles - listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \ + listbox $cflist -fg $fgcolor -bg $bgcolor \ + -selectmode extended -width $geometry(cflistw) \ -yscrollcommand ".ctop.cdet.right.sb set" scrollbar .ctop.cdet.right.sb -command "$cflist yview" pack .ctop.cdet.right.sb -side right -fill y @@ -679,7 +714,9 @@ proc savestuff {w} { global canv canv2 canv3 ctext cflist mainfont textfont global stuffsaved findmergefiles gaudydiff maxgraphpct - global maxwidth authorcolors curidfont + global maxwidth authorcolors curidfont bgcolor fgcolor + global diffremcolor diffaddcolor hunksepcolor + global diffmerge1color diffmerge2color if {$stuffsaved} return if {![winfo viewable .]} return @@ -721,6 +758,27 @@ puts $f "# the last entry will be reused." puts $f "#" puts $f "set authorcolors {$authorcolors}" + puts $f "#" + puts $f "# The background color in the text windows" + puts $f "set bgcolor $bgcolor" + puts $f "#" + puts $f "# The text color used in the diff and file list view" + puts $f "set fgcolor $fgcolor" + puts $f "#" + puts $f "# Color to display + lines in diffs" + puts $f "set diffaddcolor $diffaddcolor" + puts $f "#" + puts $f "# Color to display - lines in diffs" + puts $f "set diffremcolor $diffremcolor" + puts $f "#" + puts $f "# Merge diffs: Color to signal lines from first parent" + puts $f "set diffmerge1color $diffmerge1color" + puts $f "#" + puts $f "# Merge diffs: Color to signal lines from second parent" + puts $f "set diffmerge2color $diffmerge2color" + puts $f "#" + puts $f "# Hunkseparator (@@ -lineno,lines +lineno,lines @@) color" + puts $f "set hunksepcolor $hunksepcolor" close $f file rename -force "~/.hgk-new" "~/.hgk" } @@ -3891,6 +3949,16 @@ set authorcolors { black blue deeppink mediumorchid blue burlywood4 goldenrod slateblue red2 navy dimgrey } +set bgcolor white + +# This color should probably be some system color (provided by tk), +# but as the bgcolor has always been set to white, I choose to ignore +set fgcolor black +set diffaddcolor "#00a000" +set diffremcolor red +set diffmerge1color red +set diffmerge2color blue +set hunksepcolor blue catch {source ~/.hgk}
--- a/contrib/hgwebdir.fcgi Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/hgwebdir.fcgi Fri Feb 27 08:13:42 2009 -0600 @@ -22,7 +22,6 @@ #os.environ["HGENCODING"] = "UTF-8" from mercurial.hgweb.hgwebdir_mod import hgwebdir -from mercurial.hgweb.request import wsgiapplication from flup.server.fcgi import WSGIServer # The config file looks like this. You can have paths to individual @@ -60,7 +59,4 @@ # Alternatively you can pass a list of ('virtual/path', '/real/path') tuples # or use a dictionary with entries like 'virtual/path': '/real/path' -def make_web_app(): - return hgwebdir("hgweb.config") - -WSGIServer(wsgiapplication(make_web_app)).run() +WSGIServer(hgwebdir('hgweb.config')).run()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/hgwebdir.wsgi Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,51 @@ +# An example WSGI (use with mod_wsgi) script to export multiple hgweb repos + +# adjust python path if not a system-wide install: +#import sys +#sys.path.insert(0, "/path/to/python/lib") + +# enable demandloading to reduce startup time +from mercurial import demandimport; demandimport.enable() +from mercurial.hgweb.hgwebdir_mod import hgwebdir + +# If you'd like to serve pages with UTF-8 instead of your default +# locale charset, you can do so by uncommenting the following lines. +# Note that this will cause your .hgrc files to be interpreted in +# UTF-8 and all your repo files to be displayed using UTF-8. +# +#import os +#os.environ["HGENCODING"] = "UTF-8" + +# The config file looks like this. You can have paths to individual +# repos, collections of repos in a directory tree, or both. +# +# [paths] +# virtual/path1 = /real/path1 +# virtual/path2 = /real/path2 +# virtual/root = /real/root/* +# / = /real/root2/* +# +# paths example: +# +# * First two lines mount one repository into one virtual path, like +# '/real/path1' into 'virtual/path1'. +# +# * The third entry tells every mercurial repository found in +# '/real/root', recursively, should be mounted in 'virtual/root'. This +# format is preferred over the [collections] one, using absolute paths +# as configuration keys is not supported on every platform (including +# Windows). +# +# * The last entry is a special case mounting all repositories in +# '/real/root2' in the root of the virtual directory. +# +# collections example: say directory tree /foo contains repos /foo/bar, +# /foo/quux/baz. Give this config section: +# [collections] +# /foo = /foo +# Then repos will list as bar and quux/baz. +# +# Alternatively you can pass a list of ('virtual/path', '/real/path') tuples +# or use a dictionary with entries like 'virtual/path': '/real/path' + +application = hgwebdir('hgweb.config')
--- a/contrib/mergetools.hgrc Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/mergetools.hgrc Fri Feb 27 08:13:42 2009 -0600 @@ -38,8 +38,9 @@ p4merge.gui=True p4merge.priority=-8 -tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output +tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output tortoisemerge.regkey=Software\TortoiseSVN +tortoisemerge.checkchanged=True tortoisemerge.gui=True ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output @@ -49,3 +50,14 @@ filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge filemerge.args=-left $other -right $local -ancestor $base -merge $output filemerge.gui=True + +beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo +beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 +beyondcompare3.regname=ExePath +beyondcompare3.gui=True + +winmerge.args=/e /u /dl local /dr other /wr $local $other $output +winmerge.regkey=Software\Thingamahoochie\WinMerge +winmerge.regname=Executable +winmerge.checkchanged=True +winmerge.gui=True
--- a/contrib/tcsh_completion Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/tcsh_completion Fri Feb 27 08:13:42 2009 -0600 @@ -2,7 +2,7 @@ # tcsh completion for Mercurial # # This file has been auto-generated by tcsh_completion_build.sh for -# Mercurial Distributed SCM (version 325c07fd2ebd) +# Mercurial Distributed SCM (version 1.1.2) # # Copyright (C) 2005 TK Soh. # @@ -19,24 +19,31 @@ -y --noninteractive \ -q --quiet \ -v --verbose \ + --config \ --debug \ --debugger \ + --encoding \ + --encodingmode \ + --lsprof \ --traceback \ --time \ --profile \ --version \ -h --help)/' \ - 'p/1/(add addremove annotate bundle cat \ - clone commit ci copy cp \ - debugancestor debugcheckstate debugconfig debugdata debugindex \ - debugindexdot debugrename debugstate debugwalk diff \ - export forget grep heads help \ - identify id import patch incoming \ - in init locate log history \ - manifest outgoing out parents paths \ - pull push rawcommit recover remove \ - rm rename mv revert root \ - serve status tag tags tip \ - unbundle undo update up checkout \ - co verify version)/' + 'p/1/(add addremove annotate blame archive \ + backout bisect branch branches bundle \ + cat clone commit ci copy \ + cp debugancestor debugcheckstate debugcomplete debugdata \ + debugdate debugfsinfo debugindex debugindexdot debuginstall \ + debugrawcommit rawcommit debugrebuildstate debugrename debugsetparents \ + debugstate debugwalk diff export grep \ + heads help identify id import \ + patch incoming in init locate \ + log history manifest merge outgoing \ + out parents paths pull push \ + recover remove rm rename mv \ + resolve revert rollback root serve \ + showconfig debugconfig status st tag \ + tags tip unbundle update up \ + checkout co verify version)/'
--- a/contrib/tcsh_completion_build.sh Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/tcsh_completion_build.sh Fri Feb 27 08:13:42 2009 -0600 @@ -37,7 +37,7 @@ hg_commands=`hg --debug help | \ sed -e '1,/^list of commands:/d' \ - -e '/^global options:/,$d' \ + -e '/^enabled extensions:/,$d' \ -e '/^ [^ ]/!d; s/[,:]//g;' | \ xargs -n5 | \ sed -e '$!s/$/ \\\\/g; 2,$s/^ */ /g'`
--- a/contrib/win32/mercurial.ini Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/win32/mercurial.ini Fri Feb 27 08:13:42 2009 -0600 @@ -5,6 +5,13 @@ [ui] editor = notepad +; show changed files and be a bit more verbose if True +; verbose = True + +; username data to appear in commits +; it usually takes the form: Joe User <joe.user@host.com> +; username = Joe User <j.user@example.com> + ; By default, we try to encode and decode all files that do not ; contain ASCII NUL characters. What this means is that we try to set @@ -37,5 +44,10 @@ ; Alternatively, you can explicitly specify each file extension that ; you want decoded (any you omit will be left untouched), like this: +; **.txt = dumbdecode: +[hgk] +; Replace the following with your path to hgk, uncomment it and +; install ActiveTcl (or another win32 port) +; path="C:\Program Files\Mercurial\Contrib\hgk.tcl" -; **.txt = dumbdecode: +
--- a/contrib/win32/mercurial.iss Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/win32/mercurial.iss Fri Feb 27 08:13:42 2009 -0600 @@ -1,8 +1,7 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - [Setup] -AppCopyright=Copyright 2005-2008 Matt Mackall and others +AppCopyright=Copyright 2005-2009 Matt Mackall and others AppName=Mercurial AppVerName=Mercurial snapshot InfoAfterFile=contrib/win32/postinstall.txt @@ -18,7 +17,7 @@ DefaultDirName={pf}\Mercurial SourceDir=..\.. VersionInfoDescription=Mercurial distributed SCM -VersionInfoCopyright=Copyright 2005-2008 Matt Mackall and others +VersionInfoCopyright=Copyright 2005-2009 Matt Mackall and others VersionInfoCompany=Matt Mackall and others InternalCompressLevel=max SolidCompression=true @@ -31,8 +30,10 @@ Source: contrib\mercurial.el; DestDir: {app}/Contrib Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim Source: contrib\zsh_completion; DestDir: {app}/Contrib +Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme -Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Flags: confirmoverwrite +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') Source: dist\library.zip; DestDir: {app} @@ -64,8 +65,32 @@ [UninstallDelete] Type: files; Name: "{app}\hg.exe.local" +[Code] +var + WriteFile: Boolean; + CheckDone: Boolean; -[Code] +function CheckFile(): Boolean; +begin + if not CheckDone then begin + WriteFile := True; + if FileExists(ExpandConstant(CurrentFileName)) then begin + WriteFile := MsgBox('' + ExpandConstant(CurrentFileName) + '' #13#13 'The file already exists.' #13#13 'Would you like Setup to overwrite it?', mbConfirmation, MB_YESNO) = idYes; + end; + CheckDone := True; + end; + Result := WriteFile; +end; + +procedure ConcatenateFiles(); +var + MergeConfigs: TArrayOfString; +begin + if LoadStringsFromFile(ExpandConstant('{tmp}\mergetools.hgrc'),MergeConfigs) then begin + SaveStringsToFile(ExpandConstant(CurrentFileName),MergeConfigs,True); + end; +end; + procedure Touch(fn: String); begin SaveStringToFile(ExpandConstant(fn), '', False);
--- a/contrib/zsh_completion Sun Jan 25 19:15:49 2009 +0100 +++ b/contrib/zsh_completion Fri Feb 27 08:13:42 2009 -0600 @@ -4,14 +4,13 @@ # it into your zsh function path (/usr/share/zsh/site-functions for # instance) # -# Copyright (C) 2005 Steve Borho +# Copyright (C) 2005-6 Steve Borho # Copyright (C) 2006-8 Brendan Cully <brendan@kublai.com> # # This is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2 of the License, or (at your # option) any later version. -# emulate -LR zsh setopt extendedglob @@ -118,27 +117,17 @@ typeset -ga _hg_cmd_list typeset -gA _hg_alias_list local hline cmd cmdalias - _call_program help hg --verbose help | while read -A hline + + _call_program hg hg debugcomplete -v 2>/dev/null | while read -A hline do - cmd="$hline[1]" - case $cmd in - *:) - cmd=${cmd%:} - _hg_cmd_list+=($cmd) - ;; - *,) - cmd=${cmd%,} - _hg_cmd_list+=($cmd) - integer i=2 - while (( i <= $#hline )) - do - cmdalias=${hline[$i]%(:|,)} - _hg_cmd_list+=($cmdalias) - _hg_alias_list+=($cmdalias $cmd) - (( i++ )) - done - ;; - esac + cmd=$hline[1] + _hg_cmd_list+=($cmd) + + for cmdalias in $hline[2,-1] + do + _hg_cmd_list+=($cmdalias) + _hg_alias_list+=($cmdalias $cmd) + done done }
--- a/doc/Makefile Sun Jan 25 19:15:49 2009 +0100 +++ b/doc/Makefile Fri Feb 27 08:13:42 2009 -0600 @@ -3,7 +3,7 @@ HTML=$(SOURCES:%.txt=%.html) PREFIX=/usr/local MANDIR=$(PREFIX)/share/man -INSTALL=install -c +INSTALL=install -c -m 644 PYTHON=python ASCIIDOC=asciidoc
--- a/hg Sun Jan 25 19:15:49 2009 +0100 +++ b/hg Fri Feb 27 08:13:42 2009 -0600 @@ -8,7 +8,14 @@ # of the GNU General Public License, incorporated herein by reference. # enable importing on demand to reduce startup time -from mercurial import demandimport; demandimport.enable() +try: + from mercurial import demandimport; demandimport.enable() +except ImportError: + import sys + sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" % + ' '.join(sys.path)) + sys.stderr.write("(check your install and PYTHONPATH)\n") + sys.exit(-1) import sys import mercurial.util
--- a/hgext/alias.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/alias.py Fri Feb 27 08:13:42 2009 -0600 @@ -9,9 +9,8 @@ mycmd = cmd --args ''' -from mercurial.cmdutil import findcmd, UnknownCommand, AmbiguousCommand -from mercurial import commands from mercurial.i18n import _ +from mercurial import commands, cmdutil, error cmdtable = {} @@ -43,16 +42,16 @@ return try: - self._cmd = findcmd(self._target, commands.table, False)[1] + self._cmd = cmdutil.findcmd(self._target, commands.table, False)[1] if self._cmd == self: raise RecursiveCommand() if self._target in commands.norepo.split(' '): commands.norepo += ' %s' % self._name return - except UnknownCommand: + except error.UnknownCommand: msg = _('*** [alias] %s: command %s is unknown') % \ (self._name, self._target) - except AmbiguousCommand: + except error.AmbiguousCommand: msg = _('*** [alias] %s: command %s is ambiguous') % \ (self._name, self._target) except RecursiveCommand:
--- a/hgext/bookmarks.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/bookmarks.py Fri Feb 27 08:13:42 2009 -0600 @@ -14,19 +14,26 @@ It is possible to use bookmark names in every revision lookup (e.g. hg merge, hg update). + +The bookmark extension offers the possiblity to have a more git-like experience +by adding the following configuration option to your .hgrc: + +[bookmarks] +track.current = True + +This will cause bookmarks to track the bookmark that you are currently on, and +just updates it. This is similar to git's approach of branching. ''' -from mercurial.commands import templateopts, hex, short from mercurial.i18n import _ -from mercurial import cmdutil, util, commands, changelog -from mercurial.node import nullid, nullrev -from mercurial.repo import RepoError -import mercurial, mercurial.localrepo, mercurial.repair, os +from mercurial.node import nullid, nullrev, hex, short +from mercurial import util, commands, localrepo, repair, extensions +import os def parse(repo): '''Parse .hg/bookmarks file and return a dictionary - Bookmarks are stored as {HASH}\s{NAME}\n (localtags format) values + Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values in the .hg/bookmarks file. They are read by the parse() method and returned as a dictionary with name => hash values. @@ -54,11 +61,55 @@ ''' if os.path.exists(repo.join('bookmarks')): util.copyfile(repo.join('bookmarks'), repo.join('undo.bookmarks')) + if current(repo) not in refs: + setcurrent(repo, None) file = repo.opener('bookmarks', 'w+') - for refspec, node in refs.items(): + for refspec, node in refs.iteritems(): file.write("%s %s\n" % (hex(node), refspec)) file.close() +def current(repo): + '''Get the current bookmark + + If we use gittishsh branches we have a current bookmark that + we are on. This function returns the name of the bookmark. It + is stored in .hg/bookmarks.current + ''' + if repo._bookmarkcurrent: + return repo._bookmarkcurrent + mark = None + if os.path.exists(repo.join('bookmarks.current')): + file = repo.opener('bookmarks.current') + # No readline() in posixfile_nt, reading everything is cheap + mark = (file.readlines() or [''])[0] + if mark == '': + mark = None + file.close() + repo._bookmarkcurrent = mark + return mark + +def setcurrent(repo, mark): + '''Set the name of the bookmark that we are currently on + + Set the name of the bookmark that we are on (hg update <bookmark>). + The name is recoreded in .hg/bookmarks.current + ''' + if current(repo) == mark: + return + + refs = parse(repo) + + # do not update if we do update to a rev equal to the current bookmark + if (mark not in refs and + current(repo) and refs[current(repo)] == repo.changectx('.').node()): + return + if mark not in refs: + mark = '' + file = repo.opener('bookmarks.current', 'w+') + file.write(mark) + file.close() + repo._bookmarkcurrent = mark + def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None): '''mercurial bookmarks @@ -85,6 +136,8 @@ raise util.Abort(_("new bookmark name required")) marks[mark] = marks[rename] del marks[rename] + if current(repo) == rename: + setcurrent(repo, mark) write(repo, marks) return @@ -121,7 +174,11 @@ ui.status("no bookmarks set\n") else: for bmark, n in marks.iteritems(): - prefix = (n == cur) and '*' or ' ' + if ui.configbool('bookmarks', 'track.current'): + prefix = (bmark == current(repo) and n == cur) and '*' or ' ' + else: + prefix = (n == cur) and '*' or ' ' + ui.write(" %s %-25s %d:%s\n" % ( prefix, bmark, repo.changelog.rev(n), hexfn(n))) return @@ -140,14 +197,14 @@ saveheads.append(p) return [r for r in tostrip if r not in saveheads] -def strip(ui, repo, node, backup="all"): +def strip(oldstrip, ui, repo, node, backup="all"): """Strip bookmarks if revisions are stripped using the mercurial.strip method. This usually happens during qpush and qpop""" revisions = _revstostrip(repo.changelog, node) marks = parse(repo) update = [] - for mark, n in marks.items(): + for mark, n in marks.iteritems(): if repo.changelog.rev(n) in revisions: update.append(mark) oldstrip(ui, repo, node, backup) @@ -156,16 +213,14 @@ marks[m] = repo.changectx('.').node() write(repo, marks) -oldstrip = mercurial.repair.strip -mercurial.repair.strip = strip - def reposetup(ui, repo): - if not isinstance(repo, mercurial.localrepo.localrepository): + if not isinstance(repo, localrepo.localrepository): return # init a bookmark cache as otherwise we would get a infinite reading # in lookup() repo._bookmarks = None + repo._bookmarkcurrent = None class bookmark_repo(repo.__class__): def rollback(self): @@ -192,9 +247,14 @@ marks = parse(repo) update = False for mark, n in marks.items(): - if n in parents: - marks[mark] = node - update = True + if ui.configbool('bookmarks', 'track.current'): + if mark == current(repo) and n in parents: + marks[mark] = node + update = True + else: + if n in parents: + marks[mark] = node + update = True if update: write(repo, marks) return node @@ -218,8 +278,35 @@ write(repo, marks) return result + def tags(self): + """Merge bookmarks with normal tags""" + if self.tagscache: + return self.tagscache + + tagscache = super(bookmark_repo, self).tags() + tagscache.update(parse(repo)) + return tagscache + repo.__class__ = bookmark_repo +def uisetup(ui): + extensions.wrapfunction(repair, "strip", strip) + if ui.configbool('bookmarks', 'track.current'): + extensions.wrapcommand(commands.table, 'update', updatecurbookmark) + +def updatecurbookmark(orig, ui, repo, *args, **opts): + '''Set the current bookmark + + If the user updates to a bookmark we update the .hg/bookmarks.current + file. + ''' + res = orig(ui, repo, *args, **opts) + rev = opts['rev'] + if not rev and len(args) > 0: + rev = args[0] + setcurrent(repo, rev) + return res + cmdtable = { "bookmarks": (bookmark, @@ -227,5 +314,5 @@ ('r', 'rev', '', _('revision')), ('d', 'delete', False, _('delete a given bookmark')), ('m', 'rename', '', _('rename a given bookmark'))], - _('hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]')), + _('hg bookmarks [-f] [-d] [-m NAME] [-r NAME] [NAME]')), }
--- a/hgext/bugzilla.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/bugzilla.py Fri Feb 27 08:13:42 2009 -0600 @@ -4,53 +4,111 @@ # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -# -# hook extension to update comments of bugzilla bugs when changesets -# that refer to bugs by id are seen. this hook does not change bug -# status, only comments. -# -# to configure, add items to '[bugzilla]' section of hgrc. -# -# to use, configure bugzilla extension and enable like this: -# -# [extensions] -# hgext.bugzilla = -# -# [hooks] -# # run bugzilla hook on every change pulled or pushed in here -# incoming.bugzilla = python:hgext.bugzilla.hook -# -# config items: -# -# section name is 'bugzilla'. -# [bugzilla] -# -# REQUIRED: -# host = bugzilla # mysql server where bugzilla database lives -# password = ** # user's password -# version = 2.16 # version of bugzilla installed -# -# OPTIONAL: -# bzuser = ... # fallback bugzilla user name to record comments with -# db = bugs # database to connect to -# notify = ... # command to run to get bugzilla to send mail -# regexp = ... # regexp to match bug ids (must contain one "()" group) -# strip = 0 # number of slashes to strip for url paths -# style = ... # style file to use when formatting comments -# template = ... # template to use when formatting comments -# timeout = 5 # database connection timeout (seconds) -# user = bugs # user to connect to database as -# [web] -# baseurl = http://hgserver/... # root of hg web site for browsing commits -# -# if hg committer names are not same as bugzilla user names, use -# "usermap" feature to map from committer email to bugzilla user name. -# usermap can be in hgrc or separate config file. -# -# [bugzilla] -# usermap = filename # cfg file with "committer"="bugzilla user" info -# [usermap] -# committer_email = bugzilla_user_name + +'''Bugzilla integration + +This hook extension adds comments on bugs in Bugzilla when changesets +that refer to bugs by Bugzilla ID are seen. The hook does not change bug +status. + +The hook updates the Bugzilla database directly. Only Bugzilla installations +using MySQL are supported. + +The hook relies on a Bugzilla script to send bug change notification emails. +That script changes between Bugzilla versions; the 'processmail' script used +prior to 2.18 is replaced in 2.18 and subsequent versions by +'config/sendbugmail.pl'. Note that these will be run by Mercurial as the user +pushing the change; you will need to ensure the Bugzilla install file +permissions are set appropriately. + +Configuring the extension: + + [bugzilla] + host Hostname of the MySQL server holding the Bugzilla database. + db Name of the Bugzilla database in MySQL. Default 'bugs'. + user Username to use to access MySQL server. Default 'bugs'. + password Password to use to access MySQL server. + timeout Database connection timeout (seconds). Default 5. + version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and + later, '2.18' for Bugzilla versions from 2.18 and '2.16' for + versions prior to 2.18. + bzuser Fallback Bugzilla user name to record comments with, if + changeset committer cannot be found as a Bugzilla user. + bzdir Bugzilla install directory. Used by default notify. + Default '/var/www/html/bugzilla'. + notify The command to run to get Bugzilla to send bug change + notification emails. Substitutes from a map with 3 keys, + 'bzdir', 'id' (bug id) and 'user' (committer bugzilla email). + Default depends on version; from 2.18 it is + "cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s". + regexp Regular expression to match bug IDs in changeset commit message. + Must contain one "()" group. The default expression matches + 'Bug 1234', 'Bug no. 1234', 'Bug number 1234', + 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations thereof. + Matching is case insensitive. + style The style file to use when formatting comments. + template Template to use when formatting comments. Overrides + style if specified. In addition to the usual Mercurial + keywords, the extension specifies: + {bug} The Bugzilla bug ID. + {root} The full pathname of the Mercurial repository. + {webroot} Stripped pathname of the Mercurial repository. + {hgweb} Base URL for browsing Mercurial repositories. + Default 'changeset {node|short} in repo {root} refers ' + 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}' + strip The number of slashes to strip from the front of {root} + to produce {webroot}. Default 0. + usermap Path of file containing Mercurial committer ID to Bugzilla user + ID mappings. If specified, the file should contain one mapping + per line, "committer"="Bugzilla user". See also the + [usermap] section. + + [usermap] + Any entries in this section specify mappings of Mercurial committer ID + to Bugzilla user ID. See also [bugzilla].usermap. + "committer"="Bugzilla user" + + [web] + baseurl Base URL for browsing Mercurial repositories. Reference from + templates as {hgweb}. + +Activating the extension: + + [extensions] + hgext.bugzilla = + + [hooks] + # run bugzilla hook on every change pulled or pushed in here + incoming.bugzilla = python:hgext.bugzilla.hook + +Example configuration: + +This example configuration is for a collection of Mercurial repositories +in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in +/opt/bugzilla-3.2. + + [bugzilla] + host=localhost + password=XYZZY + version=3.0 + bzuser=unknown@domain.com + bzdir=/opt/bugzilla-3.2 + template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/rev/{node|short}\\n\\n{desc}\\n + strip=5 + + [web] + baseurl=http://dev.domain.com/hg + + [usermap] + user@emaildomain.com=user.name@bugzilladomain.com + +Commits add a comment to the Bugzilla bug record of the form: + + Changeset 3b16791d6642 in repository-name. + http://dev.domain.com/hg/repository-name/rev/3b16791d6642 + + Changeset commit comment. Bug 1234. +''' from mercurial.i18n import _ from mercurial.node import short @@ -82,6 +140,7 @@ self.cursor = self.conn.cursor() self.longdesc_id = self.get_longdesc_id() self.user_ids = {} + self.default_notify = "cd %(bzdir)s && ./processmail %(id)s %(user)s" def run(self, *args, **kwargs): '''run a query.''' @@ -118,15 +177,23 @@ unknown.pop(id, None) return util.sort(unknown.keys()) - def notify(self, ids): + def notify(self, ids, committer): '''tell bugzilla to send mail.''' self.ui.status(_('telling bugzilla to send mail:\n')) + (user, userid) = self.get_bugzilla_user(committer) for id in ids: self.ui.status(_(' bug %s\n') % id) - cmd = self.ui.config('bugzilla', 'notify', - 'cd /var/www/html/bugzilla && ' - './processmail %s nobody@nowhere.com') % id + cmdfmt = self.ui.config('bugzilla', 'notify', self.default_notify) + bzdir = self.ui.config('bugzilla', 'bzdir', '/var/www/html/bugzilla') + try: + # Backwards-compatible with old notify string, which + # took one string. This will throw with a new format + # string. + cmd = cmdfmt % id + except TypeError: + cmd = cmdfmt % {'bzdir': bzdir, 'id': id, 'user': user} + self.ui.note(_('running notify command %s\n') % cmd) fp = util.popen('(%s) 2>&1' % cmd) out = fp.read() ret = fp.close() @@ -161,9 +228,10 @@ return bzuser return user - def add_comment(self, bugid, text, committer): - '''add comment to bug. try adding comment as committer of - changeset, otherwise as default bugzilla user.''' + def get_bugzilla_user(self, committer): + '''see if committer is a registered bugzilla user. Return + bugzilla username and userid if so. If not, return default + bugzilla username and userid.''' user = self.map_committer(committer) try: userid = self.get_user_id(user) @@ -174,9 +242,16 @@ raise util.Abort(_('cannot find bugzilla user id for %s') % user) userid = self.get_user_id(defaultuser) + user = defaultuser except KeyError: raise util.Abort(_('cannot find bugzilla user id for %s or %s') % (user, defaultuser)) + return (user, userid) + + def add_comment(self, bugid, text, committer): + '''add comment to bug. try adding comment as committer of + changeset, otherwise as default bugzilla user.''' + (user, userid) = self.get_bugzilla_user(committer) now = time.strftime('%Y-%m-%d %H:%M:%S') self.run('''insert into longdescs (bug_id, who, bug_when, thetext) @@ -185,12 +260,20 @@ self.run('''insert into bugs_activity (bug_id, who, bug_when, fieldid) values (%s, %s, %s, %s)''', (bugid, userid, now, self.longdesc_id)) + self.conn.commit() -class bugzilla_3_0(bugzilla_2_16): +class bugzilla_2_18(bugzilla_2_16): + '''support for bugzilla 2.18 series.''' + + def __init__(self, ui): + bugzilla_2_16.__init__(self, ui) + self.default_notify = "cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s" + +class bugzilla_3_0(bugzilla_2_18): '''support for bugzilla 3.0 series.''' def __init__(self, ui): - bugzilla_2_16.__init__(self, ui) + bugzilla_2_18.__init__(self, ui) def get_longdesc_id(self): '''get identity of longdesc field''' @@ -205,6 +288,7 @@ # different schemas. _versions = { '2.16': bugzilla_2_16, + '2.18': bugzilla_2_18, '3.0': bugzilla_3_0 } @@ -283,7 +367,7 @@ mapfile = self.ui.config('bugzilla', 'style') tmpl = self.ui.config('bugzilla', 'template') t = cmdutil.changeset_templater(self.ui, self.repo, - False, mapfile, False) + False, None, mapfile, False) if not mapfile and not tmpl: tmpl = _('changeset {node|short} in repo {root} refers ' 'to bug {bug}.\ndetails:\n\t{desc|tabindent}') @@ -320,7 +404,7 @@ if ids: for id in ids: bz.update(id, ctx) - bz.notify(ids) + bz.notify(ids, util.email(ctx.user())) except MySQLdb.MySQLError, err: raise util.Abort(_('database error: %s') % err[1])
--- a/hgext/churn.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/churn.py Fri Feb 27 08:13:42 2009 -0600 @@ -12,31 +12,10 @@ import os, sys import time, datetime -def get_tty_width(): - if 'COLUMNS' in os.environ: - try: - return int(os.environ['COLUMNS']) - except ValueError: - pass - try: - import termios, array, fcntl - for dev in (sys.stdout, sys.stdin): - try: - fd = dev.fileno() - if not os.isatty(fd): - continue - arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) - return array.array('h', arri)[1] - except ValueError: - pass - except ImportError: - pass - return 80 - def maketemplater(ui, repo, tmpl): tmpl = templater.parsestring(tmpl, quoted=False) try: - t = cmdutil.changeset_templater(ui, repo, False, None, False) + t = cmdutil.changeset_templater(ui, repo, False, None, None, False) except SyntaxError, inst: raise util.Abort(inst.args[0]) t.use_template(tmpl) @@ -100,7 +79,7 @@ newpct = int(100.0 * count / max(len(repo), 1)) if pct < newpct: pct = newpct - ui.write(_("\rGenerating stats: %d%%") % pct) + ui.write(_("\rgenerating stats: %d%%") % pct) sys.stdout.flush() if opts.get('progress'): @@ -111,7 +90,7 @@ def churn(ui, repo, *pats, **opts): - '''Graph count of revisions grouped by template + '''graph count of revisions grouped by template Will graph count of changed lines or revisions grouped by template or alternatively by date, if dateformat is used. In this case it will override @@ -157,7 +136,7 @@ maxcount = float(max([v for k, v in rate])) maxname = max([len(k) for k, v in rate]) - ttywidth = get_tty_width() + ttywidth = util.termwidth() ui.debug(_("assuming %i character terminal\n") % ttywidth) width = ttywidth - maxname - 2 - 6 - 2 - 2
--- a/hgext/color.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/color.py Fri Feb 27 08:13:42 2009 -0600 @@ -204,6 +204,7 @@ _diff_prefixes = [('diff', 'diffline'), ('copy', 'extended'), ('rename', 'extended'), + ('old', 'extended'), ('new', 'extended'), ('deleted', 'extended'), ('---', 'file_a'),
--- a/hgext/convert/__init__.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/__init__.py Fri Feb 27 08:13:42 2009 -0600 @@ -7,13 +7,14 @@ '''converting foreign VCS repositories to Mercurial''' import convcmd +import cvsps from mercurial import commands from mercurial.i18n import _ # Commands definition was moved elsewhere to ease demandload job. def convert(ui, src, dest=None, revmapfile=None, **opts): - """Convert a foreign SCM repository to a Mercurial one. + """convert a foreign SCM repository to a Mercurial one. Accepted source formats [identifiers]: - Mercurial [hg] @@ -183,7 +184,18 @@ def debugsvnlog(ui, **opts): return convcmd.debugsvnlog(ui, **opts) -commands.norepo += " convert debugsvnlog" +def debugcvsps(ui, *args, **opts): + '''create changeset information from CVS + + This command is intended as a debugging tool for the CVS to Mercurial + converter, and can be used as a direct replacement for cvsps. + + Hg debugcvsps reads the CVS rlog for current directory (or any named + directory) in the CVS repository, and converts the log to a series of + changesets based on matching commit log entries and dates.''' + return cvsps.debugcvsps(ui, *args, **opts) + +commands.norepo += " convert debugsvnlog debugcvsps" cmdtable = { "convert": @@ -200,4 +212,22 @@ (debugsvnlog, [], 'hg debugsvnlog'), + "debugcvsps": + (debugcvsps, + [ + # Main options shared with cvsps-2.1 + ('b', 'branches', [], _('only return changes on specified branches')), + ('p', 'prefix', '', _('prefix to remove from file names')), + ('r', 'revisions', [], _('only return changes after or between specified tags')), + ('u', 'update-cache', None, _("update cvs log cache")), + ('x', 'new-cache', None, _("create new cvs log cache")), + ('z', 'fuzz', 60, _('set commit time fuzz in seconds')), + ('', 'root', '', _('specify cvsroot')), + # Options specific to builtin cvsps + ('', 'parents', '', _('show parent changesets')), + ('', 'ancestors', '', _('show current changeset in ancestor branches')), + # Options that are ignored for compatibility with cvsps-2.1 + ('A', 'cvs-direct', None, _('ignored for compatibility')), + ], + _('hg debugcvsps [OPTION]... [PATH]...')), }
--- a/hgext/convert/common.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/common.py Fri Feb 27 08:13:42 2009 -0600 @@ -228,7 +228,9 @@ except TypeError: pass cmdline = [util.shellquote(arg) for arg in cmdline] - cmdline += ['2>', util.nulldev, '<', util.nulldev] + if not self.ui.debugflag: + cmdline += ['2>', util.nulldev] + cmdline += ['<', util.nulldev] cmdline = ' '.join(cmdline) return cmdline @@ -323,7 +325,7 @@ self._read() def _read(self): - if self.path is None: + if not self.path: return try: fp = open(self.path, 'r')
--- a/hgext/convert/convcmd.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/convcmd.py Fri Feb 27 08:13:42 2009 -0600 @@ -206,7 +206,7 @@ _('Overriding mapping for author %s, was %s, will be %s\n') % (srcauthor, self.authors[srcauthor], dstauthor)) else: - self.ui.debug(_('Mapping author %s to %s\n') + self.ui.debug(_('mapping author %s to %s\n') % (srcauthor, dstauthor)) self.authors[srcauthor] = dstauthor except IndexError:
--- a/hgext/convert/cvs.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/cvs.py Fri Feb 27 08:13:42 2009 -0600 @@ -144,11 +144,11 @@ if branch == "HEAD": branch = "" if branch: - latest = None + latest = 0 # the last changeset that contains a base # file is our parent for r in oldrevs: - latest = max(filerevids.get(r, None), latest) + latest = max(filerevids.get(r, 0), latest) if latest: p = [latest]
--- a/hgext/convert/cvsps Sun Jan 25 19:15:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,154 +0,0 @@ -#!/usr/bin/env python -# -# Commandline front-end for cvsps.py -# -# Copyright 2008, Frank Kingswood <frank@kingswood-consulting.co.uk> -# -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. - -import sys -from mercurial import util -from mercurial.i18n import _ -from optparse import OptionParser, SUPPRESS_HELP -from hgext.convert.cvsps import createlog, createchangeset, logerror - -def main(): - '''Main program to mimic cvsps.''' - - op = OptionParser(usage='%prog [-bpruvxz] path', - description='Read CVS rlog for current directory or named ' - 'path in repository, and convert the log to changesets ' - 'based on matching commit log entries and dates.') - - # Options that are ignored for compatibility with cvsps-2.1 - op.add_option('-A', dest='Ignore', action='store_true', help=SUPPRESS_HELP) - op.add_option('--cvs-direct', dest='Ignore', action='store_true', help=SUPPRESS_HELP) - op.add_option('-q', dest='Ignore', action='store_true', help=SUPPRESS_HELP) - - # Main options shared with cvsps-2.1 - op.add_option('-b', dest='Branches', action='append', default=[], - help='Only return changes on specified branches') - op.add_option('-p', dest='Prefix', action='store', default='', - help='Prefix to remove from file names') - op.add_option('-r', dest='Revisions', action='append', default=[], - help='Only return changes after or between specified tags') - op.add_option('-u', dest='Cache', action='store_const', const='update', - help="Update cvs log cache") - op.add_option('-v', dest='Verbose', action='count', default=0, - help='Be verbose') - op.add_option('-x', dest='Cache', action='store_const', const='write', - help="Create new cvs log cache") - op.add_option('-z', dest='Fuzz', action='store', type='int', default=60, - help='Set commit time fuzz', metavar='seconds') - op.add_option('--root', dest='Root', action='store', default='', - help='Specify cvsroot', metavar='cvsroot') - - # Options specific to this version - op.add_option('--parents', dest='Parents', action='store_true', - help='Show parent changesets') - op.add_option('--ancestors', dest='Ancestors', action='store_true', - help='Show current changeset in ancestor branches') - - options, args = op.parse_args() - - # Create a ui object for printing progress messages - class UI: - def __init__(self, verbose): - if verbose: - self.status = self.message - if verbose>1: - self.note = self.message - if verbose>2: - self.debug = self.message - def message(self, msg): - sys.stderr.write(msg) - def nomessage(self, msg): - pass - status = nomessage - note = nomessage - debug = nomessage - ui = UI(options.Verbose) - - try: - if args: - log = [] - for d in args: - log += createlog(ui, d, root=options.Root, cache=options.Cache) - else: - log = createlog(ui, root=options.Root, cache=options.Cache) - except logerror, e: - print e - return - - changesets = createchangeset(ui, log, options.Fuzz) - del log - - # Print changesets (optionally filtered) - - off = len(options.Revisions) - branches = {} # latest version number in each branch - ancestors = {} # parent branch - for cs in changesets: - - if options.Ancestors: - if cs.branch not in branches and cs.parents and cs.parents[0].id: - ancestors[cs.branch] = changesets[cs.parents[0].id-1].branch, cs.parents[0].id - branches[cs.branch] = cs.id - - # limit by branches - if options.Branches and (cs.branch or 'HEAD') not in options.Branches: - continue - - if not off: - # Note: trailing spaces on several lines here are needed to have - # bug-for-bug compatibility with cvsps. - print '---------------------' - print 'PatchSet %d ' % cs.id - print 'Date: %s' % util.datestr(cs.date, '%Y/%m/%d %H:%M:%S %1%2') - print 'Author: %s' % cs.author - print 'Branch: %s' % (cs.branch or 'HEAD') - print 'Tag%s: %s ' % (['', 's'][len(cs.tags)>1], - ','.join(cs.tags) or '(none)') - if options.Parents and cs.parents: - if len(cs.parents)>1: - print 'Parents: %s' % (','.join([str(p.id) for p in cs.parents])) - else: - print 'Parent: %d' % cs.parents[0].id - - if options.Ancestors: - b = cs.branch - r = [] - while b: - b, c = ancestors[b] - r.append('%s:%d:%d' % (b or "HEAD", c, branches[b])) - if r: - print 'Ancestors: %s' % (','.join(r)) - - print 'Log:' - print cs.comment - print - print 'Members: ' - for f in cs.entries: - fn = f.file - if fn.startswith(options.Prefix): - fn = fn[len(options.Prefix):] - print '\t%s:%s->%s%s ' % (fn, '.'.join([str(x) for x in f.parent]) or 'INITIAL', - '.'.join([str(x) for x in f.revision]), ['', '(DEAD)'][f.dead]) - print - - # have we seen the start tag? - if options.Revisions and off: - if options.Revisions[0] == str(cs.id) or \ - options.Revisions[0] in cs.tags: - off = False - - # see if we reached the end tag - if len(options.Revisions)>1 and not off: - if options.Revisions[1] == str(cs.id) or \ - options.Revisions[1] in cs.tags: - break - - -if __name__ == '__main__': - main()
--- a/hgext/convert/cvsps.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/cvsps.py Fri Feb 27 08:13:42 2009 -0600 @@ -191,7 +191,13 @@ ui.note(_("running %s\n") % (' '.join(cmd))) ui.debug(_("prefix=%r directory=%r root=%r\n") % (prefix, directory, root)) - for line in util.popen(' '.join(cmd)): + pfp = util.popen(' '.join(cmd)) + peek = pfp.readline() + while True: + line = peek + if line == '': + break + peek = pfp.readline() if line.endswith('\n'): line = line[:-1] #ui.debug('state=%d line=%r\n' % (state, line)) @@ -263,7 +269,7 @@ if re_31.match(line): state = 5 else: - assert not re_32.match(line), _('Must have at least some revisions') + assert not re_32.match(line), _('must have at least some revisions') elif state == 5: # expecting revision number and possibly (ignored) lock indication @@ -312,7 +318,7 @@ e.branches = [tuple([int(y) for y in x.strip().split('.')]) for x in m.group(1).split(';')] state = 8 - elif re_31.match(line): + elif re_31.match(line) and re_50.match(peek): state = 5 store = True elif re_32.match(line): @@ -584,3 +590,95 @@ ui.status(_('%d changeset entries\n') % len(changesets)) return changesets + + +def debugcvsps(ui, *args, **opts): + '''Read CVS rlog for current directory or named path in repository, and + convert the log to changesets based on matching commit log entries and dates.''' + + if opts["new_cache"]: + cache = "write" + elif opts["update_cache"]: + cache = "update" + else: + cache = None + + revisions = opts["revisions"] + + try: + if args: + log = [] + for d in args: + log += createlog(ui, d, root=opts["root"], cache=cache) + else: + log = createlog(ui, root=opts["root"], cache=cache) + except logerror, e: + ui.write("%r\n"%e) + return + + changesets = createchangeset(ui, log, opts["fuzz"]) + del log + + # Print changesets (optionally filtered) + + off = len(revisions) + branches = {} # latest version number in each branch + ancestors = {} # parent branch + for cs in changesets: + + if opts["ancestors"]: + if cs.branch not in branches and cs.parents and cs.parents[0].id: + ancestors[cs.branch] = changesets[cs.parents[0].id-1].branch, cs.parents[0].id + branches[cs.branch] = cs.id + + # limit by branches + if opts["branches"] and (cs.branch or 'HEAD') not in opts["branches"]: + continue + + if not off: + # Note: trailing spaces on several lines here are needed to have + # bug-for-bug compatibility with cvsps. + ui.write('---------------------\n') + ui.write('PatchSet %d \n' % cs.id) + ui.write('Date: %s\n' % util.datestr(cs.date, '%Y/%m/%d %H:%M:%S %1%2')) + ui.write('Author: %s\n' % cs.author) + ui.write('Branch: %s\n' % (cs.branch or 'HEAD')) + ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags)>1], + ','.join(cs.tags) or '(none)')) + if opts["parents"] and cs.parents: + if len(cs.parents)>1: + ui.write('Parents: %s\n' % (','.join([str(p.id) for p in cs.parents]))) + else: + ui.write('Parent: %d\n' % cs.parents[0].id) + + if opts["ancestors"]: + b = cs.branch + r = [] + while b: + b, c = ancestors[b] + r.append('%s:%d:%d' % (b or "HEAD", c, branches[b])) + if r: + ui.write('Ancestors: %s\n' % (','.join(r))) + + ui.write('Log:\n') + ui.write('%s\n\n' % cs.comment) + ui.write('Members: \n') + for f in cs.entries: + fn = f.file + if fn.startswith(opts["prefix"]): + fn = fn[len(opts["prefix"]):] + ui.write('\t%s:%s->%s%s \n' % (fn, '.'.join([str(x) for x in f.parent]) or 'INITIAL', + '.'.join([str(x) for x in f.revision]), ['', '(DEAD)'][f.dead])) + ui.write('\n') + + # have we seen the start tag? + if revisions and off: + if revisions[0] == str(cs.id) or \ + revisions[0] in cs.tags: + off = False + + # see if we reached the end tag + if len(revisions)>1 and not off: + if revisions[1] == str(cs.id) or \ + revisions[1] in cs.tags: + break
--- a/hgext/convert/darcs.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/darcs.py Fri Feb 27 08:13:42 2009 -0600 @@ -32,7 +32,7 @@ if ElementTree is None: raise util.Abort(_("Python ElementTree module is not available")) - if not os.path.exists(os.path.join(path, '_darcs', 'inventory')): + if not os.path.exists(os.path.join(path, '_darcs', 'inventories')): raise NoRepo("%s does not look like a darcs repo" % path) self.path = os.path.realpath(path)
--- a/hgext/convert/gnuarch.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/gnuarch.py Fri Feb 27 08:13:42 2009 -0600 @@ -3,7 +3,8 @@ from common import NoRepo, commandline, commit, converter_source from mercurial.i18n import _ from mercurial import util -import os, shutil, tempfile, stat +import os, shutil, tempfile, stat, locale +from email.Parser import Parser class gnuarch_source(converter_source, commandline): @@ -13,6 +14,7 @@ self.summary = '' self.date = None self.author = '' + self.continuationof = None self.add_files = [] self.mod_files = [] self.del_files = [] @@ -46,38 +48,74 @@ self.parents = {} self.tags = {} self.modecache = {} + self.catlogparser = Parser() + self.locale = locale.getpreferredencoding() + self.archives = [] def before(self): + # Get registered archives + self.archives = [i.rstrip('\n') + for i in self.runlines0('archives', '-n')] + if self.execmd == 'tla': output = self.run0('tree-version', self.path) else: output = self.run0('tree-version', '-d', self.path) self.treeversion = output.strip() - self.ui.status(_('analyzing tree version %s...\n') % self.treeversion) - # Get name of temporary directory version = self.treeversion.split('/') self.tmppath = os.path.join(tempfile.gettempdir(), 'hg-%s' % version[1]) # Generate parents dictionary - child = [] - output, status = self.runlines('revisions', self.treeversion) - self.checkexit(status, 'archive registered?') - for l in output: - rev = l.strip() - self.changes[rev] = self.gnuarch_rev(rev) + self.parents[None] = [] + treeversion = self.treeversion + child = None + while treeversion: + self.ui.status(_('analyzing tree version %s...\n') % treeversion) + + archive = treeversion.split('/')[0] + if archive not in self.archives: + self.ui.status(_('tree analysis stopped because it points to an unregistered archive %s...\n') % archive) + break + + # Get the complete list of revisions for that tree version + output, status = self.runlines('revisions', '-r', '-f', treeversion) + self.checkexit(status, 'failed retrieveing revisions for %s' % treeversion) + + # No new iteration unless a revision has a continuation-of header + treeversion = None + + for l in output: + rev = l.strip() + self.changes[rev] = self.gnuarch_rev(rev) + self.parents[rev] = [] - # Read author, date and summary - catlog = self.runlines0('cat-log', '-d', self.path, rev) - self._parsecatlog(catlog, rev) + # Read author, date and summary + catlog, status = self.run('cat-log', '-d', self.path, rev) + if status: + catlog = self.run0('cat-archive-log', rev) + self._parsecatlog(catlog, rev) + + # Populate the parents map + self.parents[child].append(rev) - self.parents[rev] = child - child = [rev] - if rev == self.rev: - break - self.parents[None] = child + # Keep track of the current revision as the child of the next + # revision scanned + child = rev + + # Check if we have to follow the usual incremental history + # or if we have to 'jump' to a different treeversion given + # by the continuation-of header. + if self.changes[rev].continuationof: + treeversion = '--'.join(self.changes[rev].continuationof.split('--')[:-1]) + break + + # If we reached a base-0 revision w/o any continuation-of + # header, it means the tree history ends here. + if rev[-6:] == 'base-0': + break def after(self): self.ui.debug(_('cleaning up %s\n') % self.tmppath) @@ -135,7 +173,7 @@ def getcommit(self, rev): changes = self.changes[rev] return commit(author = changes.author, date = changes.date, - desc = changes.summary, parents = self.parents[rev]) + desc = changes.summary, parents = self.parents[rev], rev=rev) def gettags(self): return self.tags @@ -150,26 +188,19 @@ return os.system(cmdline) def _update(self, rev): - if rev == 'base-0': - # Initialise 'base-0' revision + self.ui.debug(_('applying revision %s...\n') % rev) + changeset, status = self.runlines('replay', '-d', self.tmppath, + rev) + if status: + # Something went wrong while merging (baz or tla + # issue?), get latest revision and try from there + shutil.rmtree(self.tmppath, ignore_errors=True) self._obtainrevision(rev) else: - self.ui.debug(_('applying revision %s...\n') % rev) - revision = '%s--%s' % (self.treeversion, rev) - changeset, status = self.runlines('replay', '-d', self.tmppath, - revision) - if status: - # Something went wrong while merging (baz or tla - # issue?), get latest revision and try from there - shutil.rmtree(self.tmppath, ignore_errors=True) - self._obtainrevision(rev) - else: - old_rev = self.parents[rev][0] - self.ui.debug(_('computing changeset between %s and %s...\n') - % (old_rev, rev)) - rev_a = '%s--%s' % (self.treeversion, old_rev) - rev_b = '%s--%s' % (self.treeversion, rev) - self._parsechangeset(changeset, rev) + old_rev = self.parents[rev][0] + self.ui.debug(_('computing changeset between %s and %s...\n') + % (old_rev, rev)) + self._parsechangeset(changeset, rev) def _getfile(self, name, rev): mode = os.lstat(os.path.join(self.tmppath, name)).st_mode @@ -217,8 +248,7 @@ def _obtainrevision(self, rev): self.ui.debug(_('obtaining revision %s...\n') % rev) - revision = '%s--%s' % (self.treeversion, rev) - output = self._execute('get', revision, self.tmppath) + output = self._execute('get', rev, self.tmppath) self.checkexit(output) self.ui.debug(_('analysing revision %s...\n') % rev) files = self._readcontents(self.tmppath) @@ -230,20 +260,27 @@ return path def _parsecatlog(self, data, rev): - summary = [] - for l in data: - l = l.strip() - if summary: - summary.append(l) - elif l.startswith('Summary:'): - summary.append(l[len('Summary: '):]) - elif l.startswith('Standard-date:'): - date = l[len('Standard-date: '):] - strdate = util.strdate(date, '%Y-%m-%d %H:%M:%S') - self.changes[rev].date = util.datestr(strdate) - elif l.startswith('Creator:'): - self.changes[rev].author = l[len('Creator: '):] - self.changes[rev].summary = '\n'.join(summary) + try: + catlog = self.catlogparser.parsestr(data) + + # Commit date + self.changes[rev].date = util.datestr( + util.strdate(catlog['Standard-date'], + '%Y-%m-%d %H:%M:%S')) + + # Commit author + self.changes[rev].author = self.recode(catlog['Creator']) + + # Commit description + self.changes[rev].summary = '\n\n'.join((catlog['Summary'], + catlog.get_payload())) + self.changes[rev].summary = self.recode(self.changes[rev].summary) + + # Commit revision origin when dealing with a branch or tag + if catlog.has_key('Continuation-of'): + self.changes[rev].continuationof = self.recode(catlog['Continuation-of']) + except Exception, err: + raise util.Abort(_('could not parse cat-log of %s') % rev) def _parsechangeset(self, data, rev): for l in data:
--- a/hgext/convert/hg.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/hg.py Fri Feb 27 08:13:42 2009 -0600 @@ -15,9 +15,8 @@ import os, time from mercurial.i18n import _ -from mercurial.repo import RepoError from mercurial.node import bin, hex, nullid -from mercurial import hg, revlog, util, context +from mercurial import hg, util, context, error from common import NoRepo, commit, converter_source, converter_sink @@ -33,7 +32,7 @@ self.repo = hg.repository(self.ui, path) if not self.repo.local(): raise NoRepo(_('%s is not a local Mercurial repo') % path) - except RepoError, err: + except error.RepoError, err: ui.print_exc() raise NoRepo(err.args[0]) else: @@ -43,7 +42,7 @@ if not self.repo.local(): raise NoRepo(_('%s is not a local Mercurial repo') % path) self.created.append(path) - except RepoError, err: + except error.RepoError, err: ui.print_exc() raise NoRepo("could not create hg repo %s as sink" % path) self.lock = None @@ -159,7 +158,7 @@ try: parentctx = self.repo[self.tagsbranch] tagparent = parentctx.node() - except RepoError, inst: + except error.RepoError, inst: parentctx = None tagparent = nullid @@ -200,8 +199,8 @@ # try to provoke an exception if this isn't really a hg # repo, but some other bogus compatible-looking url if not self.repo.local(): - raise RepoError() - except RepoError: + raise error.RepoError() + except error.RepoError: ui.print_exc() raise NoRepo("%s is not a local Mercurial repo" % path) self.lastrev = None @@ -213,7 +212,7 @@ if startnode is not None: try: startnode = self.repo.lookup(startnode) - except repo.RepoError: + except error.RepoError: raise util.Abort(_('%s is not a valid start revision') % startnode) startrev = self.repo.changelog.rev(startnode) @@ -244,7 +243,7 @@ def getfile(self, name, rev): try: return self.changectx(rev)[name].data() - except revlog.LookupError, err: + except error.LookupError, err: raise IOError(err) def getmode(self, name, rev): @@ -283,7 +282,7 @@ copies[name] = copysource except TypeError: pass - except revlog.LookupError, e: + except error.LookupError, e: if not self.ignoreerrors: raise self.ignored[name] = 1
--- a/hgext/convert/subversion.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/convert/subversion.py Fri Feb 27 08:13:42 2009 -0600 @@ -601,7 +601,7 @@ part = "/".join(parts[:i]) info = part, copyfrom.get(part, None) if info[1] is not None: - self.ui.debug(_("Found parent directory %s\n") % info[1]) + self.ui.debug(_("found parent directory %s\n") % info[1]) rc = info return rc @@ -616,7 +616,7 @@ self.ui.debug(entrypath[len(frompath):] + '\n') entrypath = froment.copyfrom_path + entrypath[len(frompath):] fromrev = froment.copyfrom_rev - self.ui.debug(_("Info: %s %s %s %s\n") % (frompath, froment, ent, entrypath)) + self.ui.debug(_("info: %s %s %s %s\n") % (frompath, froment, ent, entrypath)) # We can avoid the reparent calls if the module has not changed # but it probably does not worth the pain. @@ -757,7 +757,7 @@ self.ui.note(_('found parent of branch %s at %d: %s\n') % (self.module, prevnum, prevmodule)) else: - self.ui.debug(_("No copyfrom path, don't know what to do.\n")) + self.ui.debug(_("no copyfrom path, don't know what to do.\n")) paths = [] # filter out unrelated paths
--- a/hgext/extdiff.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/extdiff.py Fri Feb 27 08:13:42 2009 -0600 @@ -80,9 +80,7 @@ '''snapshot files from working directory. if not using snapshot, -I/-X does not work and recursive diff in tools like kdiff3 and meld displays too many files.''' - repo_root = repo.root - - dirname = os.path.basename(repo_root) + dirname = os.path.basename(repo.root) if dirname == "": dirname = "root" base = os.path.join(tmproot, dirname) @@ -105,8 +103,7 @@ fp.write(chunk) fp.close() - fns_and_mtime.append((dest, os.path.join(repo_root, fn), - os.path.getmtime(dest))) + fns_and_mtime.append((dest, repo.wjoin(fn), os.path.getmtime(dest))) return dirname, fns_and_mtime @@ -120,7 +117,19 @@ another one and more than 1 file is changed - just invoke the diff for a single file in the working dir ''' - node1, node2 = cmdutil.revpair(repo, opts['rev']) + + revs = opts.get('rev') + change = opts.get('change') + + if revs and change: + msg = _('cannot specify --rev and --change at the same time') + raise util.Abort(msg) + elif change: + node2 = repo.lookup(change) + node1 = repo[node2].parents()[0].node() + else: + node1, node2 = cmdutil.revpair(repo, revs) + matcher = cmdutil.match(repo, pats, opts) modified, added, removed = repo.status(node1, node2, matcher)[:3] if not (modified or added or removed): @@ -169,7 +178,7 @@ for copy_fn, working_fn, mtime in fns_and_mtime: if os.path.getmtime(copy_fn) != mtime: - ui.debug(_('File changed while diffing. ' + ui.debug(_('file changed while diffing. ' 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn)) util.copyfile(copy_fn, working_fn) @@ -208,6 +217,7 @@ [('p', 'program', '', _('comparison program to run')), ('o', 'option', [], _('pass option to comparison program')), ('r', 'rev', [], _('revision')), + ('c', 'change', '', _('change made by revision')), ] + commands.walkopts, _('hg extdiff [OPT]... [FILE]...')), }
--- a/hgext/fetch.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/fetch.py Fri Feb 27 08:13:42 2009 -0600 @@ -11,7 +11,7 @@ from mercurial import commands, cmdutil, hg, util, url def fetch(ui, repo, source='default', **opts): - '''Pull changes from a remote repository, merge new changes if needed. + '''pull changes from a remote repository, merge new changes if needed. This finds all changes from the repository at the specified path or URL and adds them to the local repository.
--- a/hgext/graphlog.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/graphlog.py Fri Feb 27 08:13:42 2009 -0600 @@ -17,9 +17,8 @@ from mercurial.commands import templateopts, logopts, remoteopts from mercurial.i18n import _ from mercurial.node import nullrev -from mercurial.util import Abort, canonpath from mercurial import bundlerepo, changegroup, cmdutil, commands, extensions -from mercurial import hg, ui, url +from mercurial import hg, ui, url, util def revisions(repo, start, stop): """cset DAG generator yielding (rev, node, [parents]) tuples @@ -245,18 +244,6 @@ prev_node_index = node_index prev_n_columns_diff = n_columns_diff -def get_limit(limit_opt): - if limit_opt: - try: - limit = int(limit_opt) - except ValueError: - raise Abort(_("limit must be a positive integer")) - if limit <= 0: - raise Abort(_("limit must be positive")) - else: - limit = sys.maxint - return limit - def get_revs(repo, rev_opt): if rev_opt: revs = revrange(repo, rev_opt) @@ -269,8 +256,7 @@ "only_merges", "user", "only_branch", "prune", "newest_first", "no_merges", "include", "exclude"]: if op in opts and opts[op]: - raise Abort(_("--graph option is incompatible with --%s") % op) - + raise util.Abort(_("--graph option is incompatible with --%s") % op) def graphlog(ui, repo, path=None, **opts): """show revision history alongside an ASCII revision graph @@ -283,39 +269,56 @@ """ check_unsupported_flags(opts) - limit = get_limit(opts["limit"]) + limit = cmdutil.loglimit(opts) start, stop = get_revs(repo, opts["rev"]) stop = max(stop, start - limit + 1) if start == nullrev: return if path: - path = canonpath(repo.root, os.getcwd(), path) + path = util.canonpath(repo.root, os.getcwd(), path) if path: # could be reset in canonpath revdag = filerevs(repo, path, start, stop) else: revdag = revisions(repo, start, stop) - repo_parents = repo.dirstate.parents() + graphdag = graphabledag(ui, repo, revdag, opts) + ascii(ui, grapher(graphdag)) + +def graphrevs(repo, nodes, opts): + nodes.reverse() + include = util.set(nodes) + limit = cmdutil.loglimit(opts) + count = 0 + for node in nodes: + if count >= limit: + break + ctx = repo[node] + parents = [p.rev() for p in ctx.parents() if p.node() in include] + parents.sort() + yield (ctx, parents) + count += 1 + +def graphabledag(ui, repo, revdag, opts): + showparents = [ctx.node() for ctx in repo[None].parents()] displayer = show_changeset(ui, repo, opts, buffered=True) - def graphabledag(): - for (ctx, parents) in revdag: - # log_strings is the list of all log strings to draw alongside - # the graph. - displayer.show(ctx) - lines = displayer.hunk.pop(ctx.rev()).split("\n")[:-1] - char = ctx.node() in repo_parents and '@' or 'o' - yield (ctx.rev(), parents, char, lines) + for (ctx, parents) in revdag: + displayer.show(ctx) + lines = displayer.hunk.pop(ctx.rev()).split('\n')[:-1] + char = ctx.node() in showparents and '@' or 'o' + yield (ctx.rev(), parents, char, lines) + +def goutgoing(ui, repo, dest=None, **opts): + """show the outgoing changesets alongside an ASCII revision graph - ascii(ui, grapher(graphabledag())) - -def outgoing_revs(ui, repo, dest, opts): - """cset DAG generator yielding (node, [parents]) tuples + Print the outgoing changesets alongside a revision graph drawn with + ASCII characters. - This generator function walks through the revisions not found - in the destination + Nodes printed as an @ character are parents of the working + directory. """ - limit = cmdutil.loglimit(opts) + + check_unsupported_flags(opts) dest, revs, checkout = hg.parseurl( ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev')) @@ -328,65 +331,11 @@ if not o: ui.status(_("no changes found\n")) return + o = repo.changelog.nodesbetween(o, revs)[0] - o.reverse() - revdict = {} - for n in o: - revdict[repo.changectx(n).rev()]=True - count = 0 - for n in o: - if count >= limit: - break - ctx = repo.changectx(n) - parents = [p.rev() for p in ctx.parents() if p.rev() in revdict] - parents.sort() - yield (ctx, parents) - count += 1 - -def goutgoing(ui, repo, dest=None, **opts): - """show the outgoing changesets alongside an ASCII revision graph - - Print the outgoing changesets alongside a revision graph drawn with - ASCII characters. - - Nodes printed as an @ character are parents of the working - directory. - """ - check_unsupported_flags(opts) - revdag = outgoing_revs(ui, repo, dest, opts) - repo_parents = repo.dirstate.parents() - displayer = show_changeset(ui, repo, opts, buffered=True) - def graphabledag(): - for (ctx, parents) in revdag: - # log_strings is the list of all log strings to draw alongside - # the graph. - displayer.show(ctx) - lines = displayer.hunk.pop(ctx.rev()).split("\n")[:-1] - char = ctx.node() in repo_parents and '@' or 'o' - yield (ctx.rev(), parents, char, lines) - - ascii(ui, grapher(graphabledag())) - -def incoming_revs(other, chlist, opts): - """cset DAG generator yielding (node, [parents]) tuples - - This generator function walks through the revisions of the destination - not found in repo - """ - limit = cmdutil.loglimit(opts) - chlist.reverse() - revdict = {} - for n in chlist: - revdict[other.changectx(n).rev()]=True - count = 0 - for n in chlist: - if count >= limit: - break - ctx = other.changectx(n) - parents = [p.rev() for p in ctx.parents() if p.rev() in revdict] - parents.sort() - yield (ctx, parents) - count += 1 + revdag = graphrevs(repo, o, opts) + graphdag = graphabledag(ui, repo, revdag, opts) + ascii(ui, grapher(graphdag)) def gincoming(ui, repo, source="default", **opts): """show the incoming changesets alongside an ASCII revision graph @@ -417,6 +366,7 @@ cleanup = None try: + fname = opts["bundle"] if fname or not other.local(): # create a bundle (uncompressed if other repo is not local) @@ -434,19 +384,12 @@ other = bundlerepo.bundlerepository(ui, repo.root, fname) chlist = other.changelog.nodesbetween(incoming, revs)[0] - revdag = incoming_revs(other, chlist, opts) + revdag = graphrevs(other, chlist, opts) other_parents = [] displayer = show_changeset(ui, other, opts, buffered=True) - def graphabledag(): - for (ctx, parents) in revdag: - # log_strings is the list of all log strings to draw alongside - # the graph. - displayer.show(ctx) - lines = displayer.hunk.pop(ctx.rev()).split("\n")[:-1] - char = ctx.node() in other_parents and '@' or 'o' - yield (ctx.rev(), parents, char, lines) + graphdag = graphabledag(ui, repo, revdag, opts) + ascii(ui, grapher(graphdag)) - ascii(ui, grapher(graphabledag())) finally: if hasattr(other, 'close'): other.close() @@ -466,7 +409,7 @@ return wrapfn(*args, **kwargs) return orig(*args, **kwargs) entry = extensions.wrapcommand(table, cmd, graph) - entry[1].append(('g', 'graph', None, _("show the revision DAG"))) + entry[1].append(('G', 'graph', None, _("show the revision DAG"))) cmdtable = { "glog":
--- a/hgext/hgcia.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/hgcia.py Fri Feb 27 08:13:42 2009 -0600 @@ -188,7 +188,8 @@ if not template: template = self.diffstat and self.dstemplate or self.deftemplate template = templater.parsestring(template, quoted=False) - t = cmdutil.changeset_templater(self.ui, self.repo, False, style, False) + t = cmdutil.changeset_templater(self.ui, self.repo, False, None, + style, False) t.use_template(template) self.templater = t
--- a/hgext/hgk.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/hgk.py Fri Feb 27 08:13:42 2009 -0600 @@ -130,7 +130,7 @@ ui.write('\0') def base(ui, repo, node1, node2): - """Output common ancestor information""" + """output common ancestor information""" node1 = repo.lookup(node1) node2 = repo.lookup(node2) n = repo.changelog.ancestor(node1, node2) @@ -282,7 +282,7 @@ count += 1 def revparse(ui, repo, *revs, **opts): - """Parse given revisions""" + """parse given revisions""" def revstr(rev): if rev == 'HEAD': rev = 'tip'
--- a/hgext/imerge.py Sun Jan 25 19:15:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,407 +0,0 @@ -# Copyright (C) 2007 Brendan Cully <brendan@kublai.com> -# Published under the GNU GPL - -''' -imerge - interactive merge -''' - -from mercurial.i18n import _ -from mercurial.node import hex, short -from mercurial import commands, cmdutil, dispatch, fancyopts -from mercurial import hg, filemerge, util, revlog -import os, tarfile - -class InvalidStateFileException(Exception): pass - -class ImergeStateFile(object): - def __init__(self, im): - self.im = im - - def save(self, dest): - tf = tarfile.open(dest, 'w:gz') - - st = os.path.join(self.im.path, 'status') - tf.add(st, os.path.join('.hg', 'imerge', 'status')) - - for f in self.im.resolved: - (fd, fo) = self.im.conflicts[f] - abssrc = self.im.repo.wjoin(fd) - tf.add(abssrc, fd) - - tf.close() - - def load(self, source): - wlock = self.im.repo.wlock() - lock = self.im.repo.lock() - - tf = tarfile.open(source, 'r') - contents = tf.getnames() - # tarfile normalizes path separators to '/' - statusfile = '.hg/imerge/status' - if statusfile not in contents: - raise InvalidStateFileException('no status file') - - tf.extract(statusfile, self.im.repo.root) - p1, p2 = self.im.load() - if self.im.repo.dirstate.parents()[0] != p1.node(): - hg.clean(self.im.repo, p1.node()) - self.im.start(p2.node()) - for tarinfo in tf: - tf.extract(tarinfo, self.im.repo.root) - self.im.load() - -class Imerge(object): - def __init__(self, ui, repo): - self.ui = ui - self.repo = repo - - self.path = repo.join('imerge') - self.opener = util.opener(self.path) - - self.wctx = self.repo.workingctx() - self.conflicts = {} - self.resolved = [] - - def merging(self): - return len(self.wctx.parents()) > 1 - - def load(self): - # status format. \0-delimited file, fields are - # p1, p2, conflict count, conflict filenames, resolved filenames - # conflict filenames are tuples of localname, remoteorig, remotenew - - statusfile = self.opener('status') - - status = statusfile.read().split('\0') - if len(status) < 3: - raise util.Abort(_('invalid imerge status file')) - - try: - parents = [self.repo.changectx(n) for n in status[:2]] - except revlog.LookupError, e: - raise util.Abort(_('merge parent %s not in repository') % - short(e.name)) - - status = status[2:] - conflicts = int(status.pop(0)) * 3 - self.resolved = status[conflicts:] - for i in xrange(0, conflicts, 3): - self.conflicts[status[i]] = (status[i+1], status[i+2]) - - return parents - - def save(self): - lock = self.repo.lock() - - if not os.path.isdir(self.path): - os.mkdir(self.path) - statusfile = self.opener('status', 'wb') - - out = [hex(n.node()) for n in self.wctx.parents()] - out.append(str(len(self.conflicts))) - conflicts = self.conflicts.items() - conflicts.sort() - for fw, fd_fo in conflicts: - out.append(fw) - out.extend(fd_fo) - out.extend(self.resolved) - - statusfile.write('\0'.join(out)) - - def remaining(self): - return [f for f in self.conflicts if f not in self.resolved] - - def filemerge(self, fn, interactive=True): - wlock = self.repo.wlock() - - (fd, fo) = self.conflicts[fn] - p1, p2 = self.wctx.parents() - - # this could be greatly improved - realmerge = os.environ.get('HGMERGE') - if not interactive: - os.environ['HGMERGE'] = 'internal:merge' - - # The filemerge ancestor algorithm does not work if self.wctx - # already has two parents (in normal merge it doesn't yet). But - # this is very dirty. - self.wctx._parents.pop() - try: - # TODO: we should probably revert the file if merge fails - return filemerge.filemerge(self.repo, fn, fd, fo, self.wctx, p2) - finally: - self.wctx._parents.append(p2) - if realmerge: - os.environ['HGMERGE'] = realmerge - elif not interactive: - del os.environ['HGMERGE'] - - def start(self, rev=None): - _filemerge = filemerge.filemerge - def filemerge_(repo, fw, fd, fo, wctx, mctx): - self.conflicts[fw] = (fd, fo) - - filemerge.filemerge = filemerge_ - commands.merge(self.ui, self.repo, rev=rev) - filemerge.filemerge = _filemerge - - self.wctx = self.repo.workingctx() - self.save() - - def resume(self): - self.load() - - dp = self.repo.dirstate.parents() - p1, p2 = self.wctx.parents() - if p1.node() != dp[0] or p2.node() != dp[1]: - raise util.Abort(_('imerge state does not match working directory')) - - def next(self): - remaining = self.remaining() - return remaining and remaining[0] - - def resolve(self, files): - resolved = dict.fromkeys(self.resolved) - for fn in files: - if fn not in self.conflicts: - raise util.Abort(_('%s is not in the merge set') % fn) - resolved[fn] = True - self.resolved = resolved.keys() - self.resolved.sort() - self.save() - return 0 - - def unresolve(self, files): - resolved = dict.fromkeys(self.resolved) - for fn in files: - if fn not in resolved: - raise util.Abort(_('%s is not resolved') % fn) - del resolved[fn] - self.resolved = resolved.keys() - self.resolved.sort() - self.save() - return 0 - - def pickle(self, dest): - '''write current merge state to file to be resumed elsewhere''' - state = ImergeStateFile(self) - return state.save(dest) - - def unpickle(self, source): - '''read merge state from file''' - state = ImergeStateFile(self) - return state.load(source) - -def load(im, source): - if im.merging(): - raise util.Abort(_('there is already a merge in progress ' - '(update -C <rev> to abort it)')) - m, a, r, d = im.repo.status()[:4] - if m or a or r or d: - raise util.Abort(_('working directory has uncommitted changes')) - - rc = im.unpickle(source) - if not rc: - status(im) - return rc - -def merge_(im, filename=None, auto=False): - success = True - if auto and not filename: - for fn in im.remaining(): - rc = im.filemerge(fn, interactive=False) - if rc: - success = False - else: - im.resolve([fn]) - if success: - im.ui.write('all conflicts resolved\n') - else: - status(im) - return 0 - - if not filename: - filename = im.next() - if not filename: - im.ui.write('all conflicts resolved\n') - return 0 - - rc = im.filemerge(filename, interactive=not auto) - if not rc: - im.resolve([filename]) - if not im.next(): - im.ui.write('all conflicts resolved\n') - return rc - -def next(im): - n = im.next() - if n: - im.ui.write('%s\n' % n) - else: - im.ui.write('all conflicts resolved\n') - return 0 - -def resolve(im, *files): - if not files: - raise util.Abort(_('resolve requires at least one filename')) - return im.resolve(files) - -def save(im, dest): - return im.pickle(dest) - -def status(im, **opts): - if not opts.get('resolved') and not opts.get('unresolved'): - opts['resolved'] = True - opts['unresolved'] = True - - if im.ui.verbose: - p1, p2 = [short(p.node()) for p in im.wctx.parents()] - im.ui.note(_('merging %s and %s\n') % (p1, p2)) - - conflicts = im.conflicts.keys() - conflicts.sort() - remaining = dict.fromkeys(im.remaining()) - st = [] - for fn in conflicts: - if opts.get('no_status'): - mode = '' - elif fn in remaining: - mode = 'U ' - else: - mode = 'R ' - if ((opts.get('resolved') and fn not in remaining) - or (opts.get('unresolved') and fn in remaining)): - st.append((mode, fn)) - st.sort() - for (mode, fn) in st: - if im.ui.verbose: - fo, fd = im.conflicts[fn] - if fd != fn: - fn = '%s (%s)' % (fn, fd) - im.ui.write('%s%s\n' % (mode, fn)) - if opts.get('unresolved') and not remaining: - im.ui.write(_('all conflicts resolved\n')) - - return 0 - -def unresolve(im, *files): - if not files: - raise util.Abort(_('unresolve requires at least one filename')) - return im.unresolve(files) - -subcmdtable = { - 'load': (load, []), - 'merge': - (merge_, - [('a', 'auto', None, _('automatically resolve if possible'))]), - 'next': (next, []), - 'resolve': (resolve, []), - 'save': (save, []), - 'status': - (status, - [('n', 'no-status', None, _('hide status prefix')), - ('', 'resolved', None, _('only show resolved conflicts')), - ('', 'unresolved', None, _('only show unresolved conflicts'))]), - 'unresolve': (unresolve, []) -} - -def dispatch_(im, args, opts): - def complete(s, choices): - candidates = [] - for choice in choices: - if choice.startswith(s): - candidates.append(choice) - return candidates - - c, args = args[0], list(args[1:]) - cmd = complete(c, subcmdtable.keys()) - if not cmd: - raise cmdutil.UnknownCommand('imerge ' + c) - if len(cmd) > 1: - cmd.sort() - raise cmdutil.AmbiguousCommand('imerge ' + c, cmd) - cmd = cmd[0] - - func, optlist = subcmdtable[cmd] - opts = {} - try: - args = fancyopts.fancyopts(args, optlist, opts) - return func(im, *args, **opts) - except fancyopts.getopt.GetoptError, inst: - raise dispatch.ParseError('imerge', '%s: %s' % (cmd, inst)) - except TypeError: - raise dispatch.ParseError('imerge', _('%s: invalid arguments') % cmd) - -def imerge(ui, repo, *args, **opts): - '''interactive merge - - imerge lets you split a merge into pieces. When you start a merge - with imerge, the names of all files with conflicts are recorded. - You can then merge any of these files, and if the merge is - successful, they will be marked as resolved. When all files are - resolved, the merge is complete. - - If no merge is in progress, hg imerge [rev] will merge the working - directory with rev (defaulting to the other head if the repository - only has two heads). You may also resume a saved merge with - hg imerge load <file>. - - If a merge is in progress, hg imerge will default to merging the - next unresolved file. - - The following subcommands are available: - - status: - show the current state of the merge - options: - -n --no-status: do not print the status prefix - --resolved: only print resolved conflicts - --unresolved: only print unresolved conflicts - next: - show the next unresolved file merge - merge [<file>]: - merge <file>. If the file merge is successful, the file will be - recorded as resolved. If no file is given, the next unresolved - file will be merged. - resolve <file>...: - mark files as successfully merged - unresolve <file>...: - mark files as requiring merging. - save <file>: - save the state of the merge to a file to be resumed elsewhere - load <file>: - load the state of the merge from a file created by save - ''' - - im = Imerge(ui, repo) - - if im.merging(): - im.resume() - else: - rev = opts.get('rev') - if rev and args: - raise util.Abort(_('please specify just one revision')) - - if len(args) == 2 and args[0] == 'load': - pass - else: - if args: - rev = args[0] - im.start(rev=rev) - if opts.get('auto'): - args = ['merge', '--auto'] - else: - args = ['status'] - - if not args: - args = ['merge'] - - return dispatch_(im, args, opts) - -cmdtable = { - '^imerge': - (imerge, - [('r', 'rev', '', _('revision to merge')), - ('a', 'auto', None, _('automatically merge where possible'))], - _('hg imerge [command]')) -}
--- a/hgext/keyword.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/keyword.py Fri Feb 27 08:13:42 2009 -0600 @@ -137,7 +137,7 @@ templatefilters.filters['utcdate'] = utcdate self.ct = cmdutil.changeset_templater(self.ui, self.repo, - False, '', False) + False, None, '', False) def substitute(self, data, path, ctx, subfunc): '''Replaces keywords in data with expanded template.''' @@ -425,14 +425,10 @@ keyword substitutions. Monkeypatches patch and webcommands.''' - try: - if (not repo.local() or not kwtools['inc'] - or kwtools['hgcmd'] in nokwcommands.split() - or '.hg' in util.splitpath(repo.root) - or repo._url.startswith('bundle:')): - return - except AttributeError: - pass + if (not hasattr(repo, 'dirstate') or not kwtools['inc'] + or kwtools['hgcmd'] in nokwcommands.split() + or '.hg' in util.splitpath(repo.root)): + return kwtools['templater'] = kwt = kwtemplater(ui, repo)
--- a/hgext/mq.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/mq.py Fri Feb 27 08:13:42 2009 -0600 @@ -30,10 +30,9 @@ ''' from mercurial.i18n import _ -from mercurial.node import bin, hex, short -from mercurial.repo import RepoError -from mercurial import commands, cmdutil, hg, patch, revlog, util -from mercurial import repair, extensions, url +from mercurial.node import bin, hex, short, nullid, nullrev +from mercurial import commands, cmdutil, hg, patch, util +from mercurial import repair, extensions, url, error import os, sys, re, errno commands.norepo += " qclone" @@ -428,16 +427,16 @@ def qparents(self, repo, rev=None): if rev is None: (p1, p2) = repo.dirstate.parents() - if p2 == revlog.nullid: + if p2 == nullid: return p1 if len(self.applied) == 0: return None - return revlog.bin(self.applied[-1].rev) + return bin(self.applied[-1].rev) pp = repo.changelog.parents(rev) - if pp[1] != revlog.nullid: + if pp[1] != nullid: arevs = [ x.rev for x in self.applied ] - p0 = revlog.hex(pp[0]) - p1 = revlog.hex(pp[1]) + p0 = hex(pp[0]) + p1 = hex(pp[1]) if p0 in arevs: return pp[0] if p1 in arevs: @@ -455,7 +454,7 @@ pname = ".hg.patches.merge.marker" n = repo.commit(None, '[mq]: merge marker', user=None, force=1) self.removeundo(repo) - self.applied.append(statusentry(revlog.hex(n), pname)) + self.applied.append(statusentry(hex(n), pname)) self.applied_dirty = 1 head = self.qparents(repo) @@ -473,10 +472,10 @@ if not info: self.ui.warn(_("patch %s is not applied\n") % patch) return (1, None) - rev = revlog.bin(info[1]) + rev = bin(info[1]) (err, head) = self.mergeone(repo, mergeq, head, patch, rev) if head: - self.applied.append(statusentry(revlog.hex(head), patch)) + self.applied.append(statusentry(hex(head), patch)) self.applied_dirty = 1 if err: return (err, head) @@ -552,9 +551,13 @@ message.append(_("\nimported patch %s") % patchname) message = '\n'.join(message) - (patcherr, files, fuzz) = self.patch(repo, pf) - all_files.update(files) - patcherr = not patcherr + if ph.haspatch: + (patcherr, files, fuzz) = self.patch(repo, pf) + all_files.update(files) + patcherr = not patcherr + else: + self.ui.warn(_("patch %s is empty\n") % patchname) + patcherr, files, fuzz = 0, [], 0 if merge and files: # Mark as removed/merged and update dirstate parent info @@ -581,15 +584,11 @@ raise util.Abort(_("repo commit failed")) if update_status: - self.applied.append(statusentry(revlog.hex(n), patchname)) + self.applied.append(statusentry(hex(n), patchname)) if patcherr: - if not ph.haspatch: - self.ui.warn(_("patch %s is empty\n") % patchname) - err = 0 - else: - self.ui.warn(_("patch failed, rejects left in working dir\n")) - err = 1 + self.ui.warn(_("patch failed, rejects left in working dir\n")) + err = 1 break if fuzz and strict: @@ -613,7 +612,7 @@ for rev in util.sort(revs): if rev < firstrev: raise util.Abort(_('revision %d is not managed') % rev) - base = revlog.bin(self.applied[appliedbase].rev) + base = bin(self.applied[appliedbase].rev) node = repo.changelog.node(rev) if node != base: raise util.Abort(_('cannot delete revision %d above ' @@ -658,7 +657,7 @@ if appliedbase >= len(self.applied): raise util.Abort(_("revision %d is not managed") % rev) - base = revlog.bin(self.applied[appliedbase].rev) + base = bin(self.applied[appliedbase].rev) node = repo.changelog.node(rev) if node != base: raise util.Abort(_("cannot delete revision %d above " @@ -681,7 +680,7 @@ def check_toppatch(self, repo): if len(self.applied) > 0: - top = revlog.bin(self.applied[-1].rev) + top = bin(self.applied[-1].rev) pp = repo.dirstate.parents() if top not in pp: raise util.Abort(_("working directory revision is not qtip")) @@ -751,7 +750,7 @@ raise util.Abort(_("repo commit failed")) try: self.full_series[insert:insert] = [patchfn] - self.applied.append(statusentry(revlog.hex(n), patchfn)) + self.applied.append(statusentry(hex(n), patchfn)) self.parse_series() self.series_dirty = 1 self.applied_dirty = 1 @@ -963,10 +962,10 @@ raise top = self.applied[-1].name if ret[0]: - self.ui.write( - "Errors during apply, please fix and refresh %s\n" % top) + self.ui.write(_("errors during apply, please fix and " + "refresh %s\n") % top) else: - self.ui.write("Now at: %s\n" % top) + self.ui.write(_("now at: %s\n") % top) return ret[0] finally: del wlock @@ -993,38 +992,49 @@ self.ui.warn(_("no patches applied\n")) return not all + if all: + start = 0 + elif patch: + start = info[0] + 1 + else: + start = len(self.applied) - 1 + + if start >= len(self.applied): + self.ui.warn(_("qpop: %s is already at the top\n") % patch) + return + if not update: parents = repo.dirstate.parents() - rr = [ revlog.bin(x.rev) for x in self.applied ] + rr = [ bin(x.rev) for x in self.applied ] for p in parents: if p in rr: self.ui.warn(_("qpop: forcing dirstate update\n")) update = True + else: + parents = [p.hex() for p in repo[None].parents()] + needupdate = False + for entry in self.applied[start:]: + if entry.rev in parents: + needupdate = True + break + update = needupdate if not force and update: self.check_localchanges(repo) - self.applied_dirty = 1; + self.applied_dirty = 1 end = len(self.applied) - if not patch: - if all: - popi = 0 - else: - popi = len(self.applied) - 1 - else: - popi = info[0] + 1 - if popi >= end: - self.ui.warn(_("qpop: %s is already at the top\n") % patch) - return - info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] - - start = info[0] - rev = revlog.bin(info[1]) - + rev = bin(self.applied[start].rev) if update: top = self.check_toppatch(repo) - if repo.changelog.heads(rev) != [revlog.bin(self.applied[-1].rev)]: + try: + heads = repo.changelog.heads(rev) + except error.LookupError: + node = short(rev) + raise util.Abort(_('trying to pop unknown node %s') % node) + + if heads != [bin(self.applied[-1].rev)]: raise util.Abort(_("popping would remove a revision not " "managed by this patch queue")) @@ -1052,20 +1062,20 @@ try: os.removedirs(os.path.dirname(repo.wjoin(f))) except: pass repo.dirstate.forget(f) - repo.dirstate.setparents(qp, revlog.nullid) + repo.dirstate.setparents(qp, nullid) del self.applied[start:end] self.strip(repo, rev, update=False, backup='strip') if len(self.applied): - self.ui.write(_("Now at: %s\n") % self.applied[-1].name) + self.ui.write(_("now at: %s\n") % self.applied[-1].name) else: - self.ui.write(_("Patch queue now empty\n")) + self.ui.write(_("patch queue now empty\n")) finally: del wlock def diff(self, repo, pats, opts): top = self.check_toppatch(repo) if not top: - self.ui.write(_("No patches applied\n")) + self.ui.write(_("no patches applied\n")) return qp = self.qparents(repo, top) self._diffopts = patch.diffopts(self.ui, opts) @@ -1073,7 +1083,7 @@ def refresh(self, repo, pats=None, **opts): if len(self.applied) == 0: - self.ui.write(_("No patches applied\n")) + self.ui.write(_("no patches applied\n")) return 1 msg = opts.get('msg', '').rstrip() newuser = opts.get('user') @@ -1084,7 +1094,7 @@ try: self.check_toppatch(repo) (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name) - top = revlog.bin(top) + top = bin(top) if repo.changelog.heads(top) != [top]: raise util.Abort(_("cannot refresh a revision with children")) cparents = repo.changelog.parents(top) @@ -1258,7 +1268,7 @@ patchf.rename() n = repo.commit(match.files(), message, user, ph.date, match=match, force=1) - self.applied.append(statusentry(revlog.hex(n), patchfn)) + self.applied.append(statusentry(hex(n), patchfn)) except: ctx = repo[cparents[0]] repo.dirstate.rebuild(ctx.node(), ctx.manifest()) @@ -1446,7 +1456,7 @@ if not n: self.ui.warn(_("repo commit failed\n")) return 1 - self.applied.append(statusentry(revlog.hex(n),'.hg.patches.save.line')) + self.applied.append(statusentry(hex(n),'.hg.patches.save.line')) self.applied_dirty = 1 self.removeundo(repo) @@ -1524,14 +1534,14 @@ raise util.Abort(_('revision %d is the root of more than one ' 'branch') % rev[-1]) if self.applied: - base = revlog.hex(repo.changelog.node(rev[0])) + base = hex(repo.changelog.node(rev[0])) if base in [n.rev for n in self.applied]: raise util.Abort(_('revision %d is already managed') % rev[0]) - if heads != [revlog.bin(self.applied[-1].rev)]: + if heads != [bin(self.applied[-1].rev)]: raise util.Abort(_('revision %d is not the parent of ' 'the queue') % rev[0]) - base = repo.changelog.rev(revlog.bin(self.applied[0].rev)) + base = repo.changelog.rev(bin(self.applied[0].rev)) lastparent = repo.changelog.parentrevs(base)[0] else: if heads != [repo.changelog.node(rev[0])]: @@ -1545,7 +1555,7 @@ for r in rev: p1, p2 = repo.changelog.parentrevs(r) n = repo.changelog.node(r) - if p2 != revlog.nullrev: + if p2 != nullrev: raise util.Abort(_('cannot import merge revision %d') % r) if lastparent and lastparent != r: raise util.Abort(_('revision %d is not the parent of %d') @@ -1563,7 +1573,7 @@ patch.export(repo, [n], fp=patchf, opts=self.diffopts()) patchf.close() - se = statusentry(revlog.hex(n), patchname) + se = statusentry(hex(n), patchname) self.applied.insert(0, se) added.append(patchname) @@ -1602,7 +1612,7 @@ index = self.full_series_end() + i self.full_series[index:index] = [patchname] self.parse_series() - self.ui.warn("adding %s to series file\n" % patchname) + self.ui.warn(_("adding %s to series file\n") % patchname) i += 1 added.append(patchname) patchname = None @@ -1727,16 +1737,19 @@ if dest is None: dest = hg.defaultdest(source) sr = hg.repository(ui, ui.expandpath(source)) - patchespath = opts['patches'] or patchdir(sr) + if opts['patches']: + patchespath = ui.expandpath(opts['patches']) + else: + patchespath = patchdir(sr) try: pr = hg.repository(ui, patchespath) - except RepoError: + except error.RepoError: raise util.Abort(_('versioned patch repository not found' ' (see qinit -c)')) qbase, destrev = None, None if sr.local(): if sr.mq.applied: - qbase = revlog.bin(sr.mq.applied[0].rev) + qbase = bin(sr.mq.applied[0].rev) if not hg.islocal(dest): heads = dict.fromkeys(sr.heads()) for h in sr.heads(qbase): @@ -1746,7 +1759,7 @@ elif sr.capable('lookup'): try: qbase = sr.lookup('qbase') - except RepoError: + except error.RepoError: pass ui.note(_('cloning main repo\n')) sr, dr = hg.clone(ui, sr.url(), dest, @@ -1786,7 +1799,7 @@ return q.qseries(repo, start=t-1, length=1, status='A', summary=opts.get('summary')) else: - ui.write("No patches applied\n") + ui.write(_("no patches applied\n")) return 1 def next(ui, repo, **opts): @@ -1794,7 +1807,7 @@ q = repo.mq end = q.series_end() if end == len(q.series): - ui.write("All patches applied\n") + ui.write(_("all patches applied\n")) return 1 return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) @@ -1803,10 +1816,10 @@ q = repo.mq l = len(q.applied) if l == 1: - ui.write("Only one patch applied\n") + ui.write(_("only one patch applied\n")) return 1 if not l: - ui.write("No patches applied\n") + ui.write(_("no patches applied\n")) return 1 return q.qseries(repo, start=l-2, length=1, status='A', summary=opts.get('summary')) @@ -1870,7 +1883,7 @@ message = cmdutil.logmessage(opts) if opts['edit']: if not q.applied: - ui.write(_("No patches applied\n")) + ui.write(_("no patches applied\n")) return 1 if message: raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) @@ -1980,13 +1993,10 @@ With no arguments, print the currently active guards. With arguments, set guards for the named patch. - - To set a negative guard "-foo" on topmost patch ("--" is needed so - hg will not interpret "-foo" as an option): - hg qguard -- -foo + NOTE: Specifying negative guards now requires '--'. To set guards on another patch: - hg qguard other.patch +2.6.17 -stable + hg qguard -- other.patch +2.6.17 -stable ''' def status(idx): guards = q.series_guards[idx] or ['unguarded'] @@ -2018,14 +2028,14 @@ status(q.series.index(q.lookup(patch))) def header(ui, repo, patch=None): - """Print the header of the topmost or specified patch""" + """print the header of the topmost or specified patch""" q = repo.mq if patch: patch = q.lookup(patch) else: if not q.applied: - ui.write('No patches applied\n') + ui.write('no patches applied\n') return 1 patch = q.lookup('qtip') ph = repo.mq.readheaders(patch) @@ -2112,7 +2122,7 @@ patch = q.lookup(patch) else: if not q.applied: - ui.write(_('No patches applied\n')) + ui.write(_('no patches applied\n')) return patch = q.lookup('qtip') absdest = q.join(name) @@ -2126,7 +2136,7 @@ raise util.Abort(_('A patch named %s already exists in the series file') % name) if ui.verbose: - ui.write('Renaming %s to %s\n' % (patch, name)) + ui.write('renaming %s to %s\n' % (patch, name)) i = q.find_series(patch) guards = q.guard_re.findall(q.full_series[i]) q.full_series[i] = name + ''.join([' #' + g for g in guards]) @@ -2211,9 +2221,9 @@ p = repo.dirstate.parents() cl = repo.changelog update = True - if p[0] == revlog.nullid: + if p[0] == nullid: update = False - elif p[1] == revlog.nullid and rev != cl.ancestor(p[0], rev): + elif p[1] == nullid and rev != cl.ancestor(p[0], rev): update = False elif rev not in (cl.ancestor(p[0], rev), cl.ancestor(p[1], rev)): update = False @@ -2356,7 +2366,7 @@ class mqrepo(repo.__class__): def abort_if_wdir_patched(self, errmsg, force=False): if self.mq.applied and not force: - parent = revlog.hex(self.dirstate.parents()[0]) + parent = hex(self.dirstate.parents()[0]) if parent in [s.rev for s in self.mq.applied]: raise util.Abort(errmsg) @@ -2386,11 +2396,11 @@ if not q.applied: return tagscache - mqtags = [(revlog.bin(patch.rev), patch.name) for patch in q.applied] + mqtags = [(bin(patch.rev), patch.name) for patch in q.applied] if mqtags[-1][0] not in self.changelog.nodemap: self.ui.warn(_('mq status file refers to unknown node %s\n') - % revlog.short(mqtags[-1][0])) + % short(mqtags[-1][0])) return tagscache mqtags.append((mqtags[-1][0], 'qtip')) @@ -2411,10 +2421,10 @@ return super(mqrepo, self)._branchtags(partial, lrev) cl = self.changelog - qbasenode = revlog.bin(q.applied[0].rev) + qbasenode = bin(q.applied[0].rev) if qbasenode not in cl.nodemap: self.ui.warn(_('mq status file refers to unknown node %s\n') - % revlog.short(qbasenode)) + % short(qbasenode)) return super(mqrepo, self)._branchtags(partial, lrev) qbase = cl.rev(qbasenode) @@ -2486,7 +2496,7 @@ (guard, [('l', 'list', None, _('list all patches and guards')), ('n', 'none', None, _('drop all guards'))], - _('hg qguard [-l] [-n] [PATCH] [+GUARD]... [-GUARD]...')), + _('hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...')), 'qheader': (header, [], _('hg qheader [PATCH]')), "^qimport": (qimport,
--- a/hgext/notify.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/notify.py Fri Feb 27 08:13:42 2009 -0600 @@ -113,7 +113,7 @@ template = (self.ui.config('notify', hooktype) or self.ui.config('notify', 'template')) self.t = cmdutil.changeset_templater(self.ui, self.repo, - False, mapfile, False) + False, None, mapfile, False) if not mapfile and not template: template = deftemplates.get(hooktype) or single_template if template: @@ -147,7 +147,6 @@ def subscribers(self): '''return list of email addresses of subscribers to this repo.''' - subs = {} for user, pats in self.ui.configitems('usersubs'): for pat in pats.split(','): @@ -164,20 +163,18 @@ def url(self, path=None): return self.ui.config('web', 'baseurl') + (path or self.root) - def node(self, node): + def node(self, ctx): '''format one changeset.''' - - self.t.show(self.repo[node], changes=self.repo.changelog.read(node), + self.t.show(ctx, changes=ctx.changeset(), baseurl=self.ui.config('web', 'baseurl'), - root=self.repo.root, - webroot=self.root) + root=self.repo.root, webroot=self.root) def skipsource(self, source): '''true if incoming changes from this source should be skipped.''' ok_sources = self.ui.config('notify', 'sources', 'serve').split() return source not in ok_sources - def send(self, node, count, data): + def send(self, ctx, count, data): '''send message.''' p = email.Parser.Parser() @@ -196,40 +193,33 @@ for k, v in headers: msg[k] = v - def fix_subject(subject): - '''try to make subject line exist and be useful.''' - - if not subject: - if count > 1: - subject = _('%s: %d new changesets') % (self.root, count) - else: - changes = self.repo.changelog.read(node) - s = changes[4].lstrip().split('\n', 1)[0].rstrip() - subject = '%s: %s' % (self.root, s) - maxsubject = int(self.ui.config('notify', 'maxsubject', 67)) - if maxsubject and len(subject) > maxsubject: - subject = subject[:maxsubject-3] + '...' - msg['Subject'] = mail.headencode(self.ui, subject, - self.charsets, self.test) + msg['Date'] = util.datestr(format="%a, %d %b %Y %H:%M:%S %1%2") - def fix_sender(sender): - '''try to make message have proper sender.''' + # try to make subject line exist and be useful + if not subject: + if count > 1: + subject = _('%s: %d new changesets') % (self.root, count) + else: + s = ctx.description().lstrip().split('\n', 1)[0].rstrip() + subject = '%s: %s' % (self.root, s) + maxsubject = int(self.ui.config('notify', 'maxsubject', 67)) + if maxsubject and len(subject) > maxsubject: + subject = subject[:maxsubject-3] + '...' + msg['Subject'] = mail.headencode(self.ui, subject, + self.charsets, self.test) - if not sender: - sender = self.ui.config('email', 'from') or self.ui.username() - if '@' not in sender or '@localhost' in sender: - sender = self.fixmail(sender) - msg['From'] = mail.addressencode(self.ui, sender, - self.charsets, self.test) + # try to make message have proper sender + if not sender: + sender = self.ui.config('email', 'from') or self.ui.username() + if '@' not in sender or '@localhost' in sender: + sender = self.fixmail(sender) + msg['From'] = mail.addressencode(self.ui, sender, + self.charsets, self.test) - msg['Date'] = util.datestr(format="%a, %d %b %Y %H:%M:%S %1%2") - fix_subject(subject) - fix_sender(sender) - - msg['X-Hg-Notification'] = 'changeset ' + short(node) + msg['X-Hg-Notification'] = 'changeset %s' % ctx if not msg['Message-Id']: msg['Message-Id'] = ('<hg.%s.%s.%s@%s>' % - (short(node), int(time.time()), + (ctx, int(time.time()), hash(self.repo.root), socket.getfqdn())) msg['To'] = ', '.join(self.subs) @@ -244,10 +234,11 @@ mail.sendmail(self.ui, util.email(msg['From']), self.subs, msgtext) - def diff(self, node, ref): + def diff(self, ctx, ref=None): + maxdiff = int(self.ui.config('notify', 'maxdiff', 300)) - prev = self.repo.changelog.parents(node)[0] - + prev = ctx.parents()[0].node() + ref = ref and ref.node() or ctx.node() chunks = patch.diff(self.repo, prev, ref, opts=patch.diffopts(self.ui)) difflines = ''.join(chunks).splitlines() @@ -256,14 +247,16 @@ # s may be nil, don't include the header if it is if s: self.ui.write('\ndiffstat:\n\n%s' % s) + if maxdiff == 0: return - if maxdiff > 0 and len(difflines) > maxdiff: - self.ui.write(_('\ndiffs (truncated from %d to %d lines):\n\n') % - (len(difflines), maxdiff)) + elif maxdiff > 0 and len(difflines) > maxdiff: + msg = _('\ndiffs (truncated from %d to %d lines):\n\n') + self.ui.write(msg % (len(difflines), maxdiff)) difflines = difflines[:maxdiff] elif difflines: self.ui.write(_('\ndiffs (%d lines):\n\n') % len(difflines)) + self.ui.write("\n".join(difflines)) def hook(ui, repo, hooktype, node=None, source=None, **kwargs): @@ -271,26 +264,28 @@ if used as changegroup hook, send one email for all changesets in changegroup. else send one email per changeset.''' + n = notifier(ui, repo, hooktype) + ctx = repo[node] + if not n.subs: ui.debug(_('notify: no subscribers to repo %s\n') % n.root) return if n.skipsource(source): - ui.debug(_('notify: changes have source "%s" - skipping\n') % - source) + ui.debug(_('notify: changes have source "%s" - skipping\n') % source) return - node = bin(node) + ui.pushbuffer() if hooktype == 'changegroup': - start = repo[node].rev() - end = len(repo) + start, end = ctx.rev(), len(repo) count = end - start for rev in xrange(start, end): - n.node(repo[rev].node()) - n.diff(node, repo.changelog.tip()) + n.node(repo[rev]) + n.diff(ctx, repo['tip']) else: count = 1 - n.node(node) - n.diff(node, node) + n.node(ctx) + n.diff(ctx) + data = ui.popbuffer() - n.send(node, count, data) + n.send(ctx, count, data)
--- a/hgext/parentrevspec.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/parentrevspec.py Fri Feb 27 08:13:42 2009 -0600 @@ -24,6 +24,7 @@ foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo ''' import mercurial.repo +from mercurial import error def reposetup(ui, repo): if not repo.local(): @@ -34,7 +35,7 @@ try: _super = super(parentrevspecrepo, self) return _super.lookup(key) - except mercurial.repo.RepoError: + except error.RepoError: pass circ = key.find('^') @@ -50,7 +51,7 @@ base = key[:end] try: node = _super.lookup(base) - except mercurial.repo.RepoError: + except error.RepoError: # eek - reraise the first error return _super.lookup(key)
--- a/hgext/patchbomb.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/patchbomb.py Fri Feb 27 08:13:42 2009 -0600 @@ -9,8 +9,7 @@ The remainder of the changeset description. - [Optional] If the diffstat program is installed, the result of - running diffstat on the patch. + [Optional] The result of running diffstat on the patch. The patch itself, as generated by "hg export". @@ -59,7 +58,13 @@ % formail -s sendmail -bm -t < mbox -That should be all. Now your patchbomb is on its way out.''' +That should be all. Now your patchbomb is on its way out. + +You can also either configure the method option in the email section +to be a sendmail compatable mailer or fill out the [smtp] section so +that the patchbomb extension can automatically send patchbombs directly +from the commandline. See the [email] and [smtp] sections in hgrc(5) +for details.''' import os, errno, socket, tempfile, cStringIO import email.MIMEMultipart, email.MIMEBase @@ -68,19 +73,6 @@ from mercurial.i18n import _ from mercurial.node import bin -class exportee: - def __init__(self, container): - self.lines = [] - self.container = container - self.name = 'email' - - def write(self, data): - self.lines.append(data) - - def close(self): - self.container.append(''.join(self.lines).split('\n')) - self.lines = [] - def prompt(ui, prompt, default=None, rest=': ', empty_ok=False): if not ui.interactive: return default @@ -99,16 +91,12 @@ def cdiffstat(ui, summary, patchlines): s = patch.diffstat(patchlines) - if s: - if summary: - ui.write(summary, '\n') - ui.write(s, '\n') - ans = prompt(ui, _('Does the diffstat above look okay? '), 'y') - if not ans.lower().startswith('y'): - raise util.Abort(_('diffstat rejected')) - elif s is None: - ui.warn(_('no diffstat information available\n')) - s = '' + if summary: + ui.write(summary, '\n') + ui.write(s, '\n') + ans = prompt(ui, _('does the diffstat above look okay? '), 'y') + if not ans.lower().startswith('y'): + raise util.Abort(_('diffstat rejected')) return s def makepatch(ui, repo, patch, opts, _charsets, idx, total, patchname=None): @@ -239,6 +227,13 @@ o = repo.changelog.nodesbetween(o, revs or None)[0] return [str(repo.changelog.rev(r)) for r in o] + def getpatches(revs): + for r in cmdutil.revrange(repo, revs): + output = cStringIO.StringIO() + p = patch.export(repo, [r], fp=output, + opts=patch.diffopts(ui, opts)) + yield output.getvalue().split('\n') + def getbundle(dest): tmpdir = tempfile.mkdtemp(prefix='hg-email-bundle-') tmpfn = os.path.join(tmpdir, 'bundle') @@ -308,7 +303,7 @@ % len(patches)) name = None - for p, i in zip(patches, xrange(len(patches))): + for i, p in enumerate(patches): jumbo.extend(p) if patchnames: name = patchnames[i] @@ -360,18 +355,14 @@ ui.config('patchbomb', 'from') or prompt(ui, 'From', ui.username())) + # internal option used by pbranches patches = opts.get('patches') if patches: msgs = getpatchmsgs(patches, opts.get('patchnames')) elif opts.get('bundle'): msgs = getbundlemsgs(getbundle(dest)) else: - patches = [] - commands.export(ui, repo, *revs, **{'output': exportee(patches), - 'switch_parent': False, - 'text': None, - 'git': opts.get('git')}) - msgs = getpatchmsgs(patches) + msgs = getpatchmsgs(list(getpatches(revs))) def getaddrs(opt, prpt, default = None): addrs = opts.get(opt) or (ui.config('email', opt) or
--- a/hgext/purge.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/purge.py Fri Feb 27 08:13:42 2009 -0600 @@ -32,28 +32,26 @@ import os def purge(ui, repo, *dirs, **opts): - '''removes files not tracked by mercurial + '''removes files not tracked by Mercurial - Delete files not known to mercurial, this is useful to test local and - uncommitted changes in the otherwise clean source tree. + Delete files not known to Mercurial. This is useful to test local and + uncommitted changes in an otherwise-clean source tree. This means that purge will delete: - Unknown files: files marked with "?" by "hg status" - - Ignored files: files usually ignored by Mercurial because they match - a pattern in a ".hgignore" file - Empty directories: in fact Mercurial ignores directories unless they contain files under source control managment But it will leave untouched: - - Unmodified tracked files - - Modified tracked files + - Modified and unmodified tracked files + - Ignored files (unless --all is specified) - New files added to the repository (with "hg add") If directories are given on the command line, only files in these directories are considered. - Be careful with purge, you could irreversibly delete some files you + Be careful with purge, as you could irreversibly delete some files you forgot to add to the repository. If you only want to print the list of - files that this program would delete use the --print option. + files that this program would delete, use the --print option. ''' act = not opts['print'] eol = '\n' @@ -64,7 +62,7 @@ def remove(remove_func, name): if act: try: - remove_func(os.path.join(repo.root, name)) + remove_func(repo.wjoin(name)) except OSError: m = _('%s cannot be removed') % name if opts['abort_on_err']:
--- a/hgext/rebase.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/rebase.py Fri Feb 27 08:13:42 2009 -0600 @@ -13,7 +13,7 @@ http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject ''' -from mercurial import util, repair, merge, cmdutil, dispatch, commands +from mercurial import util, repair, merge, cmdutil, commands, error from mercurial import extensions, ancestor from mercurial.commands import templateopts from mercurial.node import nullrev @@ -34,7 +34,7 @@ if not first: ancestor.ancestor = newancestor else: - repo.ui.debug(_("First revision, do not change ancestor\n")) + repo.ui.debug(_("first revision, do not change ancestor\n")) stats = merge.update(repo, rev, True, True, False) return stats @@ -67,21 +67,21 @@ extrafn = opts.get('extrafn') if opts.get('keepbranches', None): if extrafn: - raise dispatch.ParseError('rebase', - _('cannot use both keepbranches and extrafn')) + raise error.ParseError( + 'rebase', _('cannot use both keepbranches and extrafn')) def extrafn(ctx, extra): extra['branch'] = ctx.branch() if contf or abortf: if contf and abortf: - raise dispatch.ParseError('rebase', - _('cannot use both abort and continue')) + raise error.ParseError('rebase', + _('cannot use both abort and continue')) if collapsef: - raise dispatch.ParseError('rebase', - _('cannot use collapse with continue or abort')) + raise error.ParseError( + 'rebase', _('cannot use collapse with continue or abort')) if (srcf or basef or destf): - raise dispatch.ParseError('rebase', + raise error.ParseError('rebase', _('abort and continue do not allow specifying revisions')) originalwd, target, state, collapsef, external = restorestatus(repo) @@ -90,8 +90,8 @@ return else: if srcf and basef: - raise dispatch.ParseError('rebase', _('cannot specify both a ' - 'revision and a base')) + raise error.ParseError('rebase', _('cannot specify both a ' + 'revision and a base')) cmdutil.bail_if_changed(repo) result = buildstate(repo, destf, srcf, basef, collapsef) if result: @@ -281,7 +281,7 @@ f.write(repo[target].hex() + '\n') f.write(repo[external].hex() + '\n') f.write('%d\n' % int(collapse)) - for d, v in state.items(): + for d, v in state.iteritems(): oldrev = repo[d].hex() newrev = repo[v].hex() f.write("%s:%s\n" % (oldrev, newrev)) @@ -400,7 +400,9 @@ 'Call rebase after pull if the latter has been invoked with --rebase' if opts.get('rebase'): if opts.get('update'): - raise util.Abort(_('--update and --rebase are not compatible')) + del opts.get['update'] + ui.debug(_('--update and --rebase are not compatible, ignoring ' + 'the update flag\n')) cmdutil.bail_if_changed(repo) revsprepull = len(repo) @@ -408,6 +410,11 @@ revspostpull = len(repo) if revspostpull > revsprepull: rebase(ui, repo, **opts) + branch = repo[None].branch() + dest = repo[branch].rev() + if dest != repo['.'].rev(): + # there was nothing to rebase we force an update + merge.update(repo, dest, False, False, False) else: orig(ui, repo, *args, **opts)
--- a/hgext/record.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/record.py Fri Feb 27 08:13:42 2009 -0600 @@ -406,15 +406,10 @@ In the end we'll record intresting changes, and everything else will be left in place, so the user can continue his work. """ - if match.files(): - changes = None - else: - changes = repo.status(match=match)[:3] - modified, added, removed = changes - match = cmdutil.matchfiles(repo, modified + added + removed) + + changes = repo.status(match=match)[:3] diffopts = mdiff.diffopts(git=True, nodates=True) - chunks = patch.diff(repo, repo.dirstate.parents()[0], match=match, - changes=changes, opts=diffopts) + chunks = patch.diff(repo, changes=changes, opts=diffopts) fp = cStringIO.StringIO() fp.write(''.join(chunks)) fp.seek(0) @@ -428,15 +423,12 @@ try: contenders.update(dict.fromkeys(h.files())) except AttributeError: pass - newfiles = [f for f in match.files() if f in contenders] - + changed = changes[0] + changes[1] + changes[2] + newfiles = [f for f in changed if f in contenders] if not newfiles: ui.status(_('no changes to record\n')) return 0 - if changes is None: - match = cmdutil.matchfiles(repo, newfiles) - changes = repo.status(match=match) modified = dict.fromkeys(changes[0]) # 2. backup changed files, so we can restore them in the end @@ -475,7 +467,9 @@ try: ui.debug(_('applying patch\n')) ui.debug(fp.getvalue()) - patch.internalpatch(fp, ui, 1, repo.root) + pfiles = {} + patch.internalpatch(fp, ui, 1, repo.root, files=pfiles) + patch.updatedir(ui, repo, pfiles) except patch.PatchError, err: s = str(err) if s:
--- a/hgext/transplant.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/transplant.py Fri Feb 27 08:13:42 2009 -0600 @@ -5,11 +5,6 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -from mercurial.i18n import _ -import os, tempfile -from mercurial import bundlerepo, changegroup, cmdutil, hg, merge -from mercurial import patch, revlog, util - '''patch transplanting tool This extension allows you to transplant patches from another branch. @@ -18,6 +13,11 @@ from a changeset hash to its hash in the source repository. ''' +from mercurial.i18n import _ +import os, tempfile +from mercurial import bundlerepo, changegroup, cmdutil, hg, merge +from mercurial import patch, revlog, util, error + class transplantentry: def __init__(self, lnode, rnode): self.lnode = lnode @@ -69,7 +69,8 @@ self.ui = ui self.path = repo.join('transplant') self.opener = util.opener(self.path) - self.transplants = transplants(self.path, 'transplants', opener=self.opener) + self.transplants = transplants(self.path, 'transplants', + opener=self.opener) def applied(self, repo, node, parent): '''returns True if a node is already an ancestor of parent @@ -109,8 +110,8 @@ parents = source.changelog.parents(node) if not opts.get('filter'): - # If the changeset parent is the same as the wdir's parent, - # just pull it. + # If the changeset parent is the same as the + # wdir's parent, just pull it. if parents[0] == p1: pulls.append(node) p1 = node @@ -124,9 +125,9 @@ domerge = False if node in merges: - # pulling all the merge revs at once would mean we couldn't - # transplant after the latest even if transplants before them - # fail. + # pulling all the merge revs at once would mean we + # couldn't transplant after the latest even if + # transplants before them fail. domerge = True if not hasnode(repo, node): repo.pull(source, heads=[node]) @@ -155,8 +156,9 @@ self.ui.status(_('%s merged at %s\n') % (revstr, revlog.short(n))) elif n: - self.ui.status(_('%s transplanted to %s\n') % (revlog.short(node), - revlog.short(n))) + self.ui.status(_('%s transplanted to %s\n') + % (revlog.short(node), + revlog.short(n))) finally: if patchfile: os.unlink(patchfile) @@ -217,7 +219,8 @@ fuzz = patch.patch(patchfile, self.ui, cwd=repo.root, files=files) if not files: - self.ui.warn(_('%s: empty changeset') % revlog.hex(node)) + self.ui.warn(_('%s: empty changeset') + % revlog.hex(node)) return None finally: files = patch.updatedir(self.ui, repo, files) @@ -231,7 +234,8 @@ p2 = node self.log(user, date, message, p1, p2, merge=merge) self.ui.write(str(inst) + '\n') - raise util.Abort(_('Fix up the merge and run hg transplant --continue')) + raise util.Abort(_('Fix up the merge and run ' + 'hg transplant --continue')) else: files = None if merge: @@ -380,7 +384,7 @@ def hasnode(repo, node): try: return repo.changelog.rev(node) != None - except revlog.RevlogError: + except error.RevlogError: return False def browserevs(ui, repo, nodes, opts): @@ -496,16 +500,19 @@ def checkopts(opts, revs): if opts.get('continue'): if filter(lambda opt: opts.get(opt), ('branch', 'all', 'merge')): - raise util.Abort(_('--continue is incompatible with branch, all or merge')) + raise util.Abort(_('--continue is incompatible with ' + 'branch, all or merge')) return if not (opts.get('source') or revs or opts.get('merge') or opts.get('branch')): - raise util.Abort(_('no source URL, branch tag or revision list provided')) + raise util.Abort(_('no source URL, branch tag or revision ' + 'list provided')) if opts.get('all'): if not opts.get('branch'): raise util.Abort(_('--all requires a branch revision')) if revs: - raise util.Abort(_('--all is incompatible with a revision list')) + raise util.Abort(_('--all is incompatible with a ' + 'revision list')) checkopts(opts, revs) @@ -553,9 +560,11 @@ revmap[int(r)] = source.lookup(r) elif opts.get('all') or not merges: if source != repo: - alltransplants = incwalk(source, incoming, branches, match=matchfn) + alltransplants = incwalk(source, incoming, branches, + match=matchfn) else: - alltransplants = transplantwalk(source, p1, branches, match=matchfn) + alltransplants = transplantwalk(source, p1, branches, + match=matchfn) if opts.get('all'): revs = alltransplants else: @@ -581,7 +590,9 @@ ('p', 'prune', [], _('skip over REV')), ('m', 'merge', [], _('merge at REV')), ('', 'log', None, _('append transplant info to log message')), - ('c', 'continue', None, _('continue last transplant session after repair')), + ('c', 'continue', None, _('continue last transplant session ' + 'after repair')), ('', 'filter', '', _('filter changesets through FILTER'))], - _('hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]...')) + _('hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] ' + '[-m REV] [REV]...')) }
--- a/hgext/win32mbcs.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/win32mbcs.py Fri Feb 27 08:13:42 2009 -0600 @@ -8,7 +8,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. # -"""Allow to use MBCS path with problematic encoding. +"""allow to use MBCS path with problematic encoding. Some MBCS encodings are not good for some path operations (i.e. splitting path, case conversion, etc.) with its encoded bytes.
--- a/hgext/zeroconf/__init__.py Sun Jan 25 19:15:49 2009 +0100 +++ b/hgext/zeroconf/__init__.py Fri Feb 27 08:13:42 2009 -0600 @@ -6,6 +6,29 @@ # the GNU General Public License (version 2), incorporated herein by # reference. +'''zeroconf support for mercurial repositories + +Zeroconf enabled repositories will be announced in a network without the need +to configure a server or a service. They can be discovered without knowing +their actual IP address. + +To use the zeroconf extension add the following entry to your hgrc file: + +[extensions] +hgext.zeroconf = + +To allow other people to discover your repository using run "hg serve" in your +repository. + + $ cd test + $ hg serve + +You can discover zeroconf enabled repositories by running "hg paths". + + $ hg paths + zc-test = http://example.com:8000/test +''' + import Zeroconf, socket, time, os from mercurial import ui from mercurial import extensions @@ -29,7 +52,7 @@ # Generic method, sometimes gives useless results dumbip = socket.gethostbyaddr(socket.gethostname())[2][0] - if not dumbip.startswith('127.'): + if not dumbip.startswith('127.') and ':' not in dumbip: return dumbip # works elsewhere, but actually sends a packet
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/i18n/da.po Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,8827 @@ +# Danish translations for Mercurial +# Danske oversættelser for Mercurial +# Copyright (C) 2009 Matt Mackall and others +# +# Translation dictionary: +# +# changeset ændring +# merge sammenføje +# patch rettelse +# repo(sitory) arkiv +# revision revision +# tag mærkat +# +msgid "" +msgstr "" +"Project-Id-Version: Mercurial\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-22 22:02+0100\n" +"PO-Revision-Date: 2009-02-22 22:05+0100\n" +"Last-Translator: <mg@daimi.au.dk>\n" +"Language-Team: Danish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#, python-format +msgid " (default: %s)" +msgstr " (standard: %s)" + +msgid "OPTIONS" +msgstr "" + +msgid "COMMANDS" +msgstr "KOMMANDOER" + +msgid " options:\n" +msgstr "" + +#, python-format +msgid "" +" aliases: %s\n" +"\n" +msgstr "" +" aliaser %s:\n" +"\n" + +msgid "return tuple of (match function, list enabled)." +msgstr "" + +#, python-format +msgid "acl: %s not enabled\n" +msgstr "acl: %s er ikke slået til\n" + +#, python-format +msgid "acl: %s enabled, %d entries for user %s\n" +msgstr "acl: %s slået til, %d indgange for bruger %s\n" + +#, python-format +msgid "config error - hook type \"%s\" cannot stop incoming changesets" +msgstr "" +"konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer" + +#, python-format +msgid "acl: changes have source \"%s\" - skipping\n" +msgstr "acl: ændringer har kilde \"%s\" - springer over\n" + +#, python-format +msgid "acl: user %s denied on %s\n" +msgstr "acl: bruger %s nægtet adgang til %s\n" + +#, python-format +msgid "acl: access denied for changeset %s" +msgstr "acl: adgang nægtet til ændring %s" + +#, python-format +msgid "acl: user %s not allowed on %s\n" +msgstr "acl: bruger %s ikke tilladt på %s\n" + +#, python-format +msgid "acl: allowing changeset %s\n" +msgstr "acl: tillader ændring %s\n" + +msgid "" +"allow user-defined command aliases\n" +"\n" +"To use, create entries in your hgrc of the form\n" +"\n" +"[alias]\n" +"mycmd = cmd --args\n" +msgstr "" + +msgid "" +"defer command lookup until needed, so that extensions loaded\n" +" after alias can be aliased" +msgstr "" + +#, python-format +msgid "*** [alias] %s: command %s is unknown" +msgstr "" + +#, python-format +msgid "*** [alias] %s: command %s is ambiguous" +msgstr "" + +#, python-format +msgid "*** [alias] %s: circular dependency on %s" +msgstr "" + +#, python-format +msgid "*** [alias] %s: no definition\n" +msgstr "" + +msgid "" +"mercurial bookmarks\n" +"\n" +"Mercurial bookmarks are local moveable pointers to changesets. Every\n" +"bookmark points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it, the\n" +"bookmark is forwarded to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup (e.g. hg\n" +"merge, hg update).\n" +"\n" +"The bookmark extension offers the possiblity to have a more git-like " +"experience\n" +"by adding the following configuration option to your .hgrc:\n" +"\n" +"[bookmarks]\n" +"track.current = True\n" +"\n" +"This will cause bookmarks to track the bookmark that you are currently on, " +"and\n" +"just updates it. This is similar to git's approach of branching.\n" +msgstr "" + +msgid "" +"Parse .hg/bookmarks file and return a dictionary\n" +"\n" +" Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n" +" in the .hg/bookmarks file. They are read by the parse() method and\n" +" returned as a dictionary with name => hash values.\n" +"\n" +" The parsed dictionary is cached until a write() operation is done.\n" +" " +msgstr "" + +msgid "" +"Write bookmarks\n" +"\n" +" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" +" in a format equal to those of localtags.\n" +"\n" +" We also store a backup of the previous state in undo.bookmarks that\n" +" can be copied back on rollback.\n" +" " +msgstr "" + +msgid "" +"Get the current bookmark\n" +"\n" +" If we use gittishsh branches we have a current bookmark that\n" +" we are on. This function returns the name of the bookmark. It\n" +" is stored in .hg/bookmarks.current\n" +" " +msgstr "" + +msgid "" +"Set the name of the bookmark that we are currently on\n" +"\n" +" Set the name of the bookmark that we are on (hg update <bookmark>).\n" +" The name is recoreded in .hg/bookmarks.current\n" +" " +msgstr "" + +msgid "" +"mercurial bookmarks\n" +"\n" +" Bookmarks are pointers to certain commits that move when\n" +" commiting. Bookmarks are local. They can be renamed, copied and\n" +" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n" +" update' to update to a given bookmark.\n" +"\n" +" You can use 'hg bookmark NAME' to set a bookmark on the current\n" +" tip with the given name. If you specify a revision using -r REV\n" +" (where REV may be an existing bookmark), the bookmark is set to\n" +" that revision.\n" +" " +msgstr "" + +msgid "a bookmark of this name does not exist" +msgstr "" + +msgid "a bookmark of the same name already exists" +msgstr "" + +msgid "new bookmark name required" +msgstr "" + +msgid "bookmark name required" +msgstr "" + +msgid "bookmark name cannot contain newlines" +msgstr "bogmærkenavn kan ikke indeholde linieskift" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "" + +msgid "" +"Strip bookmarks if revisions are stripped using\n" +" the mercurial.strip method. This usually happens during\n" +" qpush and qpop" +msgstr "" + +msgid "" +"Add a revision to the repository and\n" +" move the bookmark" +msgstr "" + +msgid "Merge bookmarks with normal tags" +msgstr "" + +msgid "" +"Set the current bookmark\n" +"\n" +" If the user updates to a bookmark we update the .hg/bookmarks.current\n" +" file.\n" +" " +msgstr "" + +msgid "force" +msgstr "" + +msgid "revision" +msgstr "" + +msgid "delete a given bookmark" +msgstr "" + +msgid "rename a given bookmark" +msgstr "" + +msgid "hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]" +msgstr "" + +msgid "" +"Bugzilla integration\n" +"\n" +"This hook extension adds comments on bugs in Bugzilla when changesets\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n" +"status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla " +"installations\n" +"using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification " +"emails.\n" +"That script changes between Bugzilla versions; the 'processmail' script " +"used\n" +"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" +"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " +"user\n" +"pushing the change; you will need to ensure the Bugzilla install file\n" +"permissions are set appropriately.\n" +"\n" +"Configuring the extension:\n" +"\n" +" [bugzilla]\n" +" host Hostname of the MySQL server holding the Bugzilla database.\n" +" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +" user Username to use to access MySQL server. Default 'bugs'.\n" +" password Password to use to access MySQL server.\n" +" timeout Database connection timeout (seconds). Default 5.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 " +"and\n" +" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" +" versions prior to 2.18.\n" +" bzuser Fallback Bugzilla user name to record comments with, if\n" +" changeset committer cannot be found as a Bugzilla user.\n" +" bzdir Bugzilla install directory. Used by default notify.\n" +" Default '/var/www/html/bugzilla'.\n" +" notify The command to run to get Bugzilla to send bug change\n" +" notification emails. Substitutes from a map with 3 keys,\n" +" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla " +"email).\n" +" Default depends on version; from 2.18 it is\n" +" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" +"(user)s\".\n" +" regexp Regular expression to match bug IDs in changeset commit " +"message.\n" +" Must contain one \"()\" group. The default expression " +"matches\n" +" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" +" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " +"thereof.\n" +" Matching is case insensitive.\n" +" style The style file to use when formatting comments.\n" +" template Template to use when formatting comments. Overrides\n" +" style if specified. In addition to the usual Mercurial\n" +" keywords, the extension specifies:\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial " +"repository.\n" +" {webroot} Stripped pathname of the Mercurial " +"repository.\n" +" {hgweb} Base URL for browsing Mercurial " +"repositories.\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +" strip The number of slashes to strip from the front of {root}\n" +" to produce {webroot}. Default 0.\n" +" usermap Path of file containing Mercurial committer ID to Bugzilla " +"user\n" +" ID mappings. If specified, the file should contain one " +"mapping\n" +" per line, \"committer\"=\"Bugzilla user\". See also the\n" +" [usermap] section.\n" +"\n" +" [usermap]\n" +" Any entries in this section specify mappings of Mercurial committer ID\n" +" to Bugzilla user ID. See also [bugzilla].usermap.\n" +" \"committer\"=\"Bugzilla user\"\n" +"\n" +" [web]\n" +" baseurl Base URL for browsing Mercurial repositories. Reference from\n" +" templates as {hgweb}.\n" +"\n" +"Activating the extension:\n" +"\n" +" [extensions]\n" +" hgext.bugzilla =\n" +"\n" +" [hooks]\n" +" # run bugzilla hook on every change pulled or pushed in here\n" +" incoming.bugzilla = python:hgext.bugzilla.hook\n" +"\n" +"Example configuration:\n" +"\n" +"This example configuration is for a collection of Mercurial repositories\n" +"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" +"/opt/bugzilla-3.2.\n" +"\n" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" +"rev/{node|short}\\n\\n{desc}\\n\n" +" strip=5\n" +"\n" +" [web]\n" +" baseurl=http://dev.domain.com/hg\n" +"\n" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com\n" +"\n" +"Commits add a comment to the Bugzilla bug record of the form:\n" +"\n" +" Changeset 3b16791d6642 in repository-name.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" +"\n" +" Changeset commit comment. Bug 1234.\n" +msgstr "" + +msgid "support for bugzilla version 2.16." +msgstr "" + +#, python-format +msgid "connecting to %s:%s as %s, password %s\n" +msgstr "forbinder til %s:%s som %s, kodeord %s\n" + +msgid "run a query." +msgstr "" + +#, python-format +msgid "query: %s %s\n" +msgstr "forespørgsel: %s %s\n" + +#, python-format +msgid "failed query: %s %s\n" +msgstr "fejlet forespørgsel: %s %s\n" + +msgid "get identity of longdesc field" +msgstr "" + +msgid "unknown database schema" +msgstr "ukendt databaseskema" + +msgid "filter not-existing bug ids from list." +msgstr "" + +msgid "filter bug ids from list that already refer to this changeset." +msgstr "" + +#, python-format +msgid "bug %d already knows about changeset %s\n" +msgstr "fejl %d kender allerede til ændring %s\n" + +msgid "tell bugzilla to send mail." +msgstr "" + +msgid "telling bugzilla to send mail:\n" +msgstr "beder bugzilla om at sende mail:\n" + +#, python-format +msgid " bug %s\n" +msgstr " fejl %s\n" + +#, python-format +msgid "running notify command %s\n" +msgstr "kører notificeringskommando %s\n" + +#, python-format +msgid "bugzilla notify command %s" +msgstr "" + +msgid "done\n" +msgstr "færdig\n" + +msgid "look up numeric bugzilla user id." +msgstr "" + +#, python-format +msgid "looking up user %s\n" +msgstr "slår bruger %s op\n" + +msgid "map name of committer to bugzilla user name." +msgstr "" + +msgid "" +"see if committer is a registered bugzilla user. Return\n" +" bugzilla username and userid if so. If not, return default\n" +" bugzilla username and userid." +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s" +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s or %s" +msgstr "" + +msgid "" +"add comment to bug. try adding comment as committer of\n" +" changeset, otherwise as default bugzilla user." +msgstr "" + +msgid "support for bugzilla 2.18 series." +msgstr "" + +msgid "support for bugzilla 3.0 series." +msgstr "" + +msgid "" +"return object that knows how to talk to bugzilla version in\n" +" use." +msgstr "" + +#, python-format +msgid "bugzilla version %s not supported" +msgstr "" + +msgid "" +"find valid bug ids that are referred to in changeset\n" +" comments and that do not already have references to this\n" +" changeset." +msgstr "" + +msgid "update bugzilla bug with reference to changeset." +msgstr "" + +msgid "" +"strip leading prefix of repo root and turn into\n" +" url-safe path." +msgstr "" + +msgid "" +"changeset {node|short} in repo {root} refers to bug {bug}.\n" +"details:\n" +"\t{desc|tabindent}" +msgstr "" + +msgid "" +"add comment to bugzilla for each changeset that refers to a\n" +" bugzilla bug id. only add a comment once per bug, so same change\n" +" seen multiple times does not fill bug with duplicate data." +msgstr "" + +#, python-format +msgid "python mysql support not available: %s" +msgstr "" + +#, python-format +msgid "hook type %s does not pass a changeset id" +msgstr "" + +#, python-format +msgid "database error: %s" +msgstr "" + +msgid "" +"show the children of the given or working dir revision\n" +"\n" +" Print the children of the working directory's revisions.\n" +" If a revision is given via --rev, the children of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (after the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" + +msgid "show children of the specified rev" +msgstr "" + +msgid "hg children [-r REV] [FILE]" +msgstr "" + +msgid "command to show certain statistics about revision history" +msgstr "" + +msgid "Calculate stats" +msgstr "" + +#, python-format +msgid "Revision %d is a merge, ignoring...\n" +msgstr "" + +#, python-format +msgid "\rgenerating stats: %d%%" +msgstr "" + +msgid "" +"graph count of revisions grouped by template\n" +"\n" +" Will graph count of changed lines or revisions grouped by template or\n" +" alternatively by date, if dateformat is used. In this case it will " +"override\n" +" template.\n" +"\n" +" By default statistics are counted for number of changed lines.\n" +"\n" +" Examples:\n" +"\n" +" # display count of changed lines for every committer\n" +" hg churn -t '{author|email}'\n" +"\n" +" # display daily activity graph\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # display activity of developers by month\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # display count of lines changed in every year\n" +" hg churn -f '%Y' -s\n" +"\n" +" The map file format used to specify aliases is fairly simple:\n" +"\n" +" <alias email> <actual email>" +msgstr "" +"plot antallet af revisioner grupperet efter et mønster\n" +"\n" +" Plotter antallet af ændrede linier eller antallet af revisioner\n" +" grupperet efter et mønster eller alternativt efter dato, hvis\n" +" dateformat bruges. I så tilfælde bruges mønstret ikke.\n" +"\n" +" Som udgangspunkt laves der statistik over antallet af ændrede\n" +" linier.\n" +"\n" +" Eksempler:\n" +"\n" +" # viser antaller af ændrede linier for hver bruger\n" +" hg churn -t '{author|email}'\n" +"\n" +" # viser graf over daglig aktivitet\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # viser månedlig aktivitet af udviklerne\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # viser antallet af linier ændret hvert år\n" +" hg churn -f '%Y' -s\n" +"\n" +" Formatet for map-filen er rimelig simpelt:\n" +"\n" +" <alias email> <faktisk email>" + +#, python-format +msgid "assuming %i character terminal\n" +msgstr "" + +msgid "count rate for the specified revision or range" +msgstr "lav statistik for de specificerede revisioner" + +msgid "count rate for revs matching date spec" +msgstr "lav statistik for revisioner som matcher dato specifikationen" + +msgid "template to group changesets" +msgstr "mønster for gruppering af ændringer" + +msgid "strftime-compatible format for grouping by date" +msgstr "strftime-kompatibelt format til gruppering efter dato" + +msgid "count rate by number of changesets" +msgstr "lav statistik efter antallet af ændringer" + +msgid "sort by key (default: sort by count)" +msgstr "sortér efter nøgle (standard: sortering efter antal)" + +msgid "file with email aliases" +msgstr "fil med email-aliaser" + +msgid "show progress" +msgstr "vis fremskridt" + +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" +msgstr "hg churn [-d DATO] [-r REVISIONER] [--aliases FIL] [--progress] [FIL]" + +msgid "" +"add color output to status, qseries, and diff-related commands\n" +"\n" +"This extension modifies the status command to add color to its output to\n" +"reflect file status, the qseries command to add color to reflect patch " +"status\n" +"(applied, unapplied, missing), and to diff-related commands to highlight\n" +"additions, removals, diff headers, and trailing whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are also\n" +"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" +"ANSI escape codes). This module also provides the render_text function,\n" +"which can be used to add effects to any text.\n" +"\n" +"To enable this extension, add this to your .hgrc file:\n" +"[extensions]\n" +"color =\n" +"\n" +"Default effects my be overriden from the .hgrc file:\n" +"\n" +"[color]\n" +"status.modified = blue bold underline red_background\n" +"status.added = green bold\n" +"status.removed = red bold blue_background\n" +"status.deleted = cyan bold underline\n" +"status.unknown = magenta bold underline\n" +"status.ignored = black bold\n" +"\n" +"# 'none' turns off all effects\n" +"status.clean = none\n" +"status.copied = none\n" +"\n" +"qseries.applied = blue bold underline\n" +"qseries.unapplied = black bold\n" +"qseries.missing = red bold\n" +"\n" +"diff.diffline = bold\n" +"diff.extended = cyan bold\n" +"diff.file_a = red bold\n" +"diff.file_b = green bold\n" +"diff.hunk = magenta\n" +"diff.deleted = red\n" +"diff.inserted = green\n" +"diff.changed = white\n" +"diff.trailingwhitespace = bold red_background\n" +msgstr "" + +msgid "Wrap text in commands to turn on each effect." +msgstr "" + +msgid "run the status command with colored output" +msgstr "" + +msgid "run the qseries command with colored output" +msgstr "" + +msgid "wrap ui.write for colored diff output" +msgstr "" + +msgid "wrap cmdutil.changeset_printer.showpatch with colored output" +msgstr "" + +msgid "run the diff command with colored output" +msgstr "" + +msgid "Initialize the extension." +msgstr "" + +msgid "patch in command to command table and load effect map" +msgstr "" + +msgid "when to colorize (always, auto, or never)" +msgstr "" + +msgid "don't colorize output" +msgstr "" + +msgid "converting foreign VCS repositories to Mercurial" +msgstr "" + +msgid "" +"convert a foreign SCM repository to a Mercurial one.\n" +"\n" +" Accepted source formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - CVS [cvs]\n" +" - Darcs [darcs]\n" +" - git [git]\n" +" - Subversion [svn]\n" +" - Monotone [mtn]\n" +" - GNU Arch [gnuarch]\n" +" - Bazaar [bzr]\n" +"\n" +" Accepted destination formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - Subversion [svn] (history on branches is not preserved)\n" +"\n" +" If no revision is given, all revisions will be converted. Otherwise,\n" +" convert will only import up to the named revision (given in a format\n" +" understood by the source).\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source with '-hg' appended. If the destination\n" +" repository doesn't exist, it will be created.\n" +"\n" +" If <REVMAP> isn't given, it will be put in a default location\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" +" file that maps each source commit ID to the destination ID for\n" +" that revision, like so:\n" +" <source ID> <destination ID>\n" +"\n" +" If the file doesn't exist, it's automatically created. It's updated\n" +" on each commit copied, so convert-repo can be interrupted and can\n" +" be run repeatedly to copy new commits.\n" +"\n" +" The [username mapping] file is a simple text file that maps each source\n" +" commit author to a destination commit author. It is handy for source " +"SCMs\n" +" that use unix logins to identify authors (eg: CVS). One line per author\n" +" mapping and the line format is:\n" +" srcauthor=whatever string you want\n" +"\n" +" The filemap is a file that allows filtering and remapping of files\n" +" and directories. Comment lines start with '#'. Each line can\n" +" contain one of the following directives:\n" +"\n" +" include path/to/file\n" +"\n" +" exclude path/to/file\n" +"\n" +" rename from/file to/file\n" +"\n" +" The 'include' directive causes a file, or all files under a\n" +" directory, to be included in the destination repository, and the\n" +" exclusion of all other files and dirs not explicitely included.\n" +" The 'exclude' directive causes files or directories to be omitted.\n" +" The 'rename' directive renames a file or directory. To rename from a\n" +" subdirectory into the root of the repository, use '.' as the path to\n" +" rename to.\n" +"\n" +" The splicemap is a file that allows insertion of synthetic\n" +" history, letting you specify the parents of a revision. This is\n" +" useful if you want to e.g. give a Subversion merge two parents, or\n" +" graft two disconnected series of history together. Each entry\n" +" contains a key, followed by a space, followed by one or two\n" +" values, separated by spaces. The key is the revision ID in the\n" +" source revision control system whose parents should be modified\n" +" (same format as a key in .hg/shamap). The values are the revision\n" +" IDs (in either the source or destination revision control system)\n" +" that should be used as the new parents for that node.\n" +"\n" +" Mercurial Source\n" +" -----------------\n" +"\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" +" ignore integrity errors when reading. Use it to fix Mercurial\n" +" repositories with missing revlogs, by converting from and to\n" +" Mercurial.\n" +" --config convert.hg.saverev=True (boolean)\n" +" allow target to preserve source revision ID\n" +" --config convert.hg.startrev=0 (hg revision identifier)\n" +" convert start revision and its descendants\n" +"\n" +" CVS Source\n" +" ----------\n" +"\n" +" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" +" to indicate the starting point of what will be converted. Direct\n" +" access to the repository files is not needed, unless of course\n" +" the repository is :local:. The conversion uses the top level\n" +" directory in the sandbox to find the CVS repository, and then uses\n" +" CVS rlog commands to find files to convert. This means that unless\n" +" a filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganisation in the CVS\n" +" sandbox is ignored.\n" +"\n" +" Because CVS does not have changesets, it is necessary to collect\n" +" individual commits to CVS and merge them into changesets. CVS\n" +" source uses its internal changeset merging code by default but can\n" +" be configured to call the external 'cvsps' program by setting:\n" +" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +" This is a legacy option and may be removed in future.\n" +"\n" +" The options shown are the defaults.\n" +"\n" +" Internal cvsps is selected by setting\n" +" --config convert.cvsps=builtin\n" +" and has a few more configurable options:\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed between\n" +" commits with identical user and log message in a single\n" +" changeset. When very large files were checked in as part\n" +" of a changeset then the default may not be long enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" insert a dummy revision merging the branch on which this log\n" +" message occurs to the branch indicated in the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" add the most recent revision on the branch indicated in the\n" +" regex as the second parent of the changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" +" merging code to be run without doing a conversion. Its parameters and\n" +" output are similar to that of cvsps 2.1.\n" +"\n" +" Subversion Source\n" +" -----------------\n" +"\n" +" Subversion source detects classical trunk/branches/tags layouts.\n" +" By default, the supplied \"svn://repo/path/\" source URL is\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists\n" +" it replaces the default branch. If \"svn://repo/path/branches\"\n" +" exists, its subdirectories are listed as possible branches. If\n" +" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" +" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" +" can be overriden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable\n" +" autodetection.\n" +"\n" +" --config convert.svn.branches=branches (directory name)\n" +" specify the directory containing branches\n" +" --config convert.svn.tags=tags (directory name)\n" +" specify the directory containing tags\n" +" --config convert.svn.trunk=trunk (directory name)\n" +" specify the name of the trunk branch\n" +"\n" +" Source history can be retrieved starting at a specific revision,\n" +" instead of being integrally converted. Only single branch\n" +" conversions are supported.\n" +"\n" +" --config convert.svn.startrev=0 (svn revision number)\n" +" specify start Subversion revision.\n" +"\n" +" Mercurial Destination\n" +" ---------------------\n" +"\n" +" --config convert.hg.clonebranches=False (boolean)\n" +" dispatch source branches in separate clones.\n" +" --config convert.hg.tagsbranch=default (branch name)\n" +" tag revisions branch name\n" +" --config convert.hg.usebranchnames=True (boolean)\n" +" preserve branch names\n" +"\n" +" " +msgstr "" + +msgid "" +"create changeset information from CVS\n" +"\n" +" This command is intended as a debugging tool for the CVS to Mercurial\n" +" converter, and can be used as a direct replacement for cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" +" directory) in the CVS repository, and converts the log to a series of\n" +" changesets based on matching commit log entries and dates." +msgstr "" + +msgid "username mapping filename" +msgstr "" + +msgid "destination repository type" +msgstr "type for destinations repository" + +msgid "remap file names using contents of file" +msgstr "" + +msgid "import up to target revision REV" +msgstr "" + +msgid "source repository type" +msgstr "" + +msgid "splice synthesized history into place" +msgstr "" + +msgid "try to sort changesets by date" +msgstr "" + +msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" +msgstr "" + +msgid "only return changes on specified branches" +msgstr "" + +msgid "prefix to remove from file names" +msgstr "" + +msgid "only return changes after or between specified tags" +msgstr "" + +msgid "update cvs log cache" +msgstr "" + +msgid "create new cvs log cache" +msgstr "" + +msgid "set commit time fuzz in seconds" +msgstr "" + +msgid "specify cvsroot" +msgstr "" + +msgid "show parent changesets" +msgstr "vis forældre-ændring" + +msgid "show current changeset in ancestor branches" +msgstr "" + +msgid "ignored for compatibility" +msgstr "" + +msgid "hg debugcvsps [OPTION]... [PATH]..." +msgstr "" + +#, python-format +msgid "%s is not a valid revision in current branch" +msgstr "" + +#, python-format +msgid "%s is not available in %s anymore" +msgstr "" + +#, python-format +msgid "cannot find required \"%s\" tool" +msgstr "" + +#, python-format +msgid "running: %s\n" +msgstr "kører: %s\n" + +#, python-format +msgid "%s error:\n" +msgstr "" + +#, python-format +msgid "%s %s" +msgstr "" + +#, python-format +msgid "could not open map file %r: %s" +msgstr "" + +#, python-format +msgid "%s: missing or unsupported repository" +msgstr "" + +#, python-format +msgid "convert: %s\n" +msgstr "" + +#, python-format +msgid "%s: unknown repository type" +msgstr "%s: ukendt arkivtype" + +#, python-format +msgid "cycle detected between %s and %s" +msgstr "" + +msgid "not all revisions were sorted" +msgstr "" + +#, python-format +msgid "Writing author map file %s\n" +msgstr "" + +#, python-format +msgid "Overriding mapping for author %s, was %s, will be %s\n" +msgstr "" + +#, python-format +msgid "mapping author %s to %s\n" +msgstr "" + +#, python-format +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "" + +#, python-format +msgid "spliced in %s as parents of %s\n" +msgstr "" + +msgid "scanning source...\n" +msgstr "" + +msgid "sorting...\n" +msgstr "" + +msgid "converting...\n" +msgstr "" + +#, python-format +msgid "source: %s\n" +msgstr "" + +#, python-format +msgid "assuming destination %s\n" +msgstr "" + +#, python-format +msgid "revision %s is not a patchset number or date" +msgstr "" + +msgid "using builtin cvsps\n" +msgstr "" + +#, python-format +msgid "connecting to %s\n" +msgstr "" + +msgid "CVS pserver authentication failed" +msgstr "CVS pserver godkendelse fejlede" + +msgid "server sucks" +msgstr "" + +#, python-format +msgid "%d bytes missing from remote file" +msgstr "%d byte mangler i fjernfilen" + +#, python-format +msgid "cvs server: %s\n" +msgstr "cvs server: %s\n" + +#, python-format +msgid "unknown CVS response: %s" +msgstr "ukendt CVS svar: %s" + +msgid "collecting CVS rlog\n" +msgstr "samler CVS rlog\n" + +#, python-format +msgid "reading cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "cache has %d log entries\n" +msgstr "" + +#, python-format +msgid "error reading cache: %r\n" +msgstr "" + +#, python-format +msgid "running %s\n" +msgstr "kører %s\n" + +#, python-format +msgid "prefix=%r directory=%r root=%r\n" +msgstr "" + +msgid "RCS file must be followed by working file" +msgstr "" + +msgid "must have at least some revisions" +msgstr "" + +msgid "expected revision number" +msgstr "" + +msgid "revision must be followed by date line" +msgstr "" + +#, python-format +msgid "writing cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "%d log entries\n" +msgstr "" + +msgid "creating changesets\n" +msgstr "opretter ændringer\n" + +#, python-format +msgid "%d changeset entries\n" +msgstr "%d ændringer\n" + +msgid "Python ElementTree module is not available" +msgstr "" + +#, python-format +msgid "cleaning up %s\n" +msgstr "rydder op %s\n" + +msgid "internal calling inconsistency" +msgstr "" + +msgid "errors in filemap" +msgstr "" + +#, python-format +msgid "%s:%d: %r already in %s list\n" +msgstr "" + +#, python-format +msgid "%s:%d: unknown directive %r\n" +msgstr "" + +msgid "source repository doesn't support --filemap" +msgstr "" + +#, python-format +msgid "%s does not look like a GNU Arch repo" +msgstr "" + +msgid "cannot find a GNU Arch tool" +msgstr "" + +#, python-format +msgid "analyzing tree version %s...\n" +msgstr "" + +#, python-format +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "" + +#, python-format +msgid "applying revision %s...\n" +msgstr "" + +#, python-format +msgid "computing changeset between %s and %s...\n" +msgstr "beregner ændringer mellem %s og %s...\n" + +#, python-format +msgid "obtaining revision %s...\n" +msgstr "henter revision %s...\n" + +#, python-format +msgid "analysing revision %s...\n" +msgstr "analyserer revision %s...\n" + +#, python-format +msgid "could not parse cat-log of %s" +msgstr "" + +#, python-format +msgid "%s is not a local Mercurial repo" +msgstr "" + +#, python-format +msgid "initializing destination %s repository\n" +msgstr "" + +msgid "run hg sink pre-conversion action\n" +msgstr "" + +msgid "run hg sink post-conversion action\n" +msgstr "" + +#, python-format +msgid "pulling from %s into %s\n" +msgstr "" + +msgid "updating tags\n" +msgstr "" + +#, python-format +msgid "%s is not a valid start revision" +msgstr "" + +#, python-format +msgid "ignoring: %s\n" +msgstr "ignorerer: %s\n" + +msgid "run hg source pre-conversion action\n" +msgstr "" + +msgid "run hg source post-conversion action\n" +msgstr "" + +#, python-format +msgid "%s does not look like a monotone repo" +msgstr "" + +#, python-format +msgid "copying file in renamed dir from '%s' to '%s'" +msgstr "" + +msgid "Subversion python bindings could not be loaded" +msgstr "" + +#, python-format +msgid "Subversion python bindings %d.%d found, 1.4 or later required" +msgstr "" + +msgid "Subversion python bindings are too old, 1.4 or later required" +msgstr "" + +#, python-format +msgid "svn: revision %s is not an integer" +msgstr "" + +#, python-format +msgid "svn: start revision %s is not an integer" +msgstr "" + +#, python-format +msgid "no revision found in module %s" +msgstr "" + +#, python-format +msgid "expected %s to be at %r, but not found" +msgstr "" + +#, python-format +msgid "found %s at %r\n" +msgstr "" + +#, python-format +msgid "ignoring empty branch %s\n" +msgstr "" + +#, python-format +msgid "found branch %s at %d\n" +msgstr "" + +msgid "svn: start revision is not supported with with more than one branch" +msgstr "" + +#, python-format +msgid "svn: no revision found after start revision %d" +msgstr "" + +#, python-format +msgid "no tags found at revision %d\n" +msgstr "" + +#, python-format +msgid "ignoring foreign branch %r\n" +msgstr "" + +#, python-format +msgid "%s not found up to revision %d" +msgstr "" + +#, python-format +msgid "branch renamed from %s to %s at %d\n" +msgstr "" + +#, python-format +msgid "reparent to %s\n" +msgstr "" + +#, python-format +msgid "copied to %s from %s@%s\n" +msgstr "" + +#, python-format +msgid "gone from %s\n" +msgstr "" + +#, python-format +msgid "found parent directory %s\n" +msgstr "" + +#, python-format +msgid "base, entry %s %s\n" +msgstr "" + +msgid "munge-o-matic\n" +msgstr "" + +#, python-format +msgid "info: %s %s %s %s\n" +msgstr "" + +#, python-format +msgid "unknown path in revision %d: %s\n" +msgstr "" + +#, python-format +msgid "mark %s came from %s:%d\n" +msgstr "" + +#, python-format +msgid "parsing revision %d (%d changes)\n" +msgstr "" + +#, python-format +msgid "found parent of branch %s at %d: %s\n" +msgstr "" + +msgid "no copyfrom path, don't know what to do.\n" +msgstr "" + +#, python-format +msgid "fetching revision log for \"%s\" from %d to %d\n" +msgstr "" + +#, python-format +msgid "skipping blacklisted revision %d\n" +msgstr "" + +#, python-format +msgid "revision %d has no entries\n" +msgstr "" + +#, python-format +msgid "svn: branch has no revision %s" +msgstr "" + +#, python-format +msgid "%r is not under %r, ignoring\n" +msgstr "" + +#, python-format +msgid "initializing svn repo %r\n" +msgstr "" + +#, python-format +msgid "initializing svn wc %r\n" +msgstr "" + +msgid "unexpected svn output:\n" +msgstr "" + +msgid "unable to cope with svn output" +msgstr "" + +msgid "XXX TAGS NOT IMPLEMENTED YET\n" +msgstr "" + +msgid "" +"\n" +"The `extdiff' Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working dir. The external diff\n" +"programs are called with a configurable set of options and two\n" +"non-option arguments: paths to directories containing snapshots of\n" +"files to compare.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.extdiff =\n" +"\n" +"The `extdiff' extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"\n" +" [extdiff]\n" +" # add new command that runs GNU diff(1) in 'context diff' mode\n" +" cdiff = gdiff -Nprc5\n" +" ## or the old way:\n" +" #cmd.cdiff = gdiff\n" +" #opts.cdiff = -Nprc5\n" +"\n" +" # add new command called vdiff, runs kdiff3\n" +" vdiff = kdiff3\n" +"\n" +" # add new command called meld, runs meld (no need to name twice)\n" +" meld =\n" +"\n" +" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" +" #(see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " +"in\n" +" # your .vimrc\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" +"\n" +"You can use -I/-X and list of file or directory names like normal\n" +"\"hg diff\" command. The `extdiff' extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" +msgstr "" + +msgid "snapshot files as of some revision" +msgstr "" + +#, python-format +msgid "making snapshot of %d files from rev %s\n" +msgstr "" + +msgid "" +"snapshot files from working directory.\n" +" if not using snapshot, -I/-X does not work and recursive diff\n" +" in tools like kdiff3 and meld displays too many files." +msgstr "" + +#, python-format +msgid "making snapshot of %d files from working dir\n" +msgstr "" + +msgid "" +"Do the actuall diff:\n" +"\n" +" - copy to a temp structure if diffing 2 internal revisions\n" +" - copy to a temp structure if diffing working revision with\n" +" another one and more than 1 file is changed\n" +" - just invoke the diff for a single file in the working dir\n" +" " +msgstr "" + +msgid "cannot specify --rev and --change at the same time" +msgstr "" + +#, python-format +msgid "running %r in %s\n" +msgstr "" + +#, python-format +msgid "file changed while diffing. Overwriting: %s (src: %s)\n" +msgstr "" + +msgid "cleaning up temp directory\n" +msgstr "" + +msgid "" +"use external program to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using\n" +" an external program. The default program used is diff, with\n" +" default options \"-Npru\".\n" +"\n" +" To select a different program, use the -p option. The program\n" +" will be passed the names of two directories to compare. To pass\n" +" additional options to the program, use the -o option. These will\n" +" be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are\n" +" shown between those revisions. If only one revision is\n" +" specified then that revision is compared to the working\n" +" directory, and, when no revisions are specified, the\n" +" working directory files are compared to its parent." +msgstr "" + +msgid "comparison program to run" +msgstr "" + +msgid "pass option to comparison program" +msgstr "" + +msgid "change made by revision" +msgstr "" + +msgid "hg extdiff [OPT]... [FILE]..." +msgstr "" + +msgid "use closure to save diff command to use" +msgstr "" + +#, python-format +msgid "hg %s [OPTION]... [FILE]..." +msgstr "" + +msgid "pulling, updating and merging in one command" +msgstr "" + +msgid "" +"pull changes from a remote repository, merge new changes if needed.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository.\n" +"\n" +" If the pulled changes add a new branch head, the head is automatically\n" +" merged, and the result of the merge is committed. Otherwise, the\n" +" working directory is updated to include the new changes.\n" +"\n" +" When a merge occurs, the newly pulled changes are assumed to be\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" +" order, use --switch-parent.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" + +msgid "outstanding uncommitted merge" +msgstr "" + +msgid "outstanding uncommitted changes" +msgstr "" + +msgid "working directory is missing some files" +msgstr "arbejdsbiblioteket mangler nogle filer" + +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" + +#, python-format +msgid "pulling from %s\n" +msgstr "hiver fra %s\n" + +msgid "fetch -r doesn't work for remote repositories yet" +msgstr "fetch -r virker endnu ikke for fjernarkiver" + +#, python-format +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" +msgstr "" + +#, python-format +msgid "updating to %d:%s\n" +msgstr "opdaterer til %d:%s\n" + +#, python-format +msgid "merging with %d:%s\n" +msgstr "sammenføjer med %d:%s\n" + +#, python-format +msgid "Automated merge with %s" +msgstr "" + +#, python-format +msgid "new changeset %d:%s merges remote changes with local\n" +msgstr "ny ændring %d:%s fletter fjernændringer sammen med lokale\n" + +msgid "a specific revision you would like to pull" +msgstr "" + +msgid "edit commit message" +msgstr "" + +msgid "edit commit message (DEPRECATED)" +msgstr "" + +msgid "switch parents when merging" +msgstr "" + +msgid "hg fetch [SOURCE]" +msgstr "" + +msgid " returns of the good and bad signatures" +msgstr "" + +msgid "error while verifying signature" +msgstr "" + +msgid "create a new gpg instance" +msgstr "" + +msgid "" +"\n" +" walk over every sigs, yields a couple\n" +" ((node, version, sig), (filename, linenumber))\n" +" " +msgstr "" + +msgid "get the keys who signed a data" +msgstr "" + +#, python-format +msgid "%s Bad signature from \"%s\"\n" +msgstr "" + +#, python-format +msgid "%s Note: Signature has expired (signed by: \"%s\")\n" +msgstr "" + +#, python-format +msgid "%s Note: This key has expired (signed by: \"%s\")\n" +msgstr "" + +msgid "list signed changesets" +msgstr "vis underskrevne ændringer" + +#, python-format +msgid "%s:%d node does not exist\n" +msgstr "%s:%d knude findes ikke\n" + +msgid "verify all the signatures there may be for a particular revision" +msgstr "verificer alle underskrifter der måtte være for en given revision" + +#, python-format +msgid "No valid signature for %s\n" +msgstr "Ingen gyldig signatur for %s\n" + +msgid "associate a string to a key (username, comment)" +msgstr "" + +msgid "" +"add a signature for the current or given revision\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "uncommitted merge - please provide a specific revision" +msgstr "" + +msgid "Error while signing" +msgstr "Fejl ved underskrivning" + +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" + +#, python-format +msgid "Added signature for changeset %s" +msgstr "" + +msgid "map a manifest into some text" +msgstr "" + +msgid "unknown signature version" +msgstr "" + +msgid "make the signature local" +msgstr "" + +msgid "sign even if the sigfile is modified" +msgstr "" + +msgid "do not commit the sigfile after signing" +msgstr "" + +msgid "the key id to sign with" +msgstr "" + +msgid "commit message" +msgstr "" + +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "" + +msgid "hg sigcheck REVISION" +msgstr "" + +msgid "hg sigs" +msgstr "" + +msgid "" +"show revision graphs in terminal windows\n" +"\n" +"This extension adds a --graph option to the incoming, outgoing and log\n" +"commands. When this options is given, an ascii representation of the\n" +"revision graph is also shown.\n" +msgstr "" + +msgid "" +"cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history from " +"revision\n" +" start to revision stop (which must be less than or equal to start).\n" +" " +msgstr "" + +msgid "" +"file cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history of a single\n" +" file from revision start to revision stop (which must be less than or\n" +" equal to start).\n" +" " +msgstr "" + +msgid "" +"grapher for asciigraph on a list of nodes and their parents\n" +"\n" +" nodes must generate tuples (node, parents, char, lines) where\n" +" - parents must generate the parents of node, in sorted order,\n" +" and max length 2,\n" +" - char is the char to print as the node symbol, and\n" +" - lines are the lines to display next to the node.\n" +" " +msgstr "" + +msgid "" +"prints an ASCII graph of the DAG returned by the grapher\n" +"\n" +" grapher is a generator that emits tuples with the following elements:\n" +"\n" +" - Character to use as node's symbol.\n" +" - List of lines to display as the node's text.\n" +" - Column of the current node in the set of ongoing edges.\n" +" - Edges; a list of (col, next_col) indicating the edges between\n" +" the current node and its parents.\n" +" - Number of columns (ongoing edges) in the current revision.\n" +" - The difference between the number of columns (ongoing edges)\n" +" in the next revision and the number of columns (ongoing edges)\n" +" in the current revision. That is: -1 means one column removed;\n" +" 0 means no columns added or removed; 1 means one column added.\n" +" " +msgstr "" + +#, python-format +msgid "--graph option is incompatible with --%s" +msgstr "" + +msgid "" +"show revision history alongside an ASCII revision graph\n" +"\n" +" Print a revision history alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "" +"show the outgoing changesets alongside an ASCII revision graph\n" +"\n" +" Print the outgoing changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +#, python-format +msgid "comparing with %s\n" +msgstr "sammenligner med %s\n" + +msgid "no changes found\n" +msgstr "fandt ingen ændringer\n" + +msgid "" +"show the incoming changesets alongside an ASCII revision graph\n" +"\n" +" Print the incoming changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "wrap the command" +msgstr "" + +msgid "show the revision DAG" +msgstr "" + +msgid "limit number of changes displayed" +msgstr "" + +msgid "show patch" +msgstr "" + +msgid "show the specified revision or range" +msgstr "" + +msgid "hg glog [OPTION]... [FILE]" +msgstr "" + +msgid "" +"CIA notification\n" +"\n" +"This is meant to be run as a changegroup or incoming hook.\n" +"To configure it, set the following options in your hgrc:\n" +"\n" +"[cia]\n" +"# your registered CIA user name\n" +"user = foo\n" +"# the name of the project in CIA\n" +"project = foo\n" +"# the module (subproject) (optional)\n" +"#module = foo\n" +"# Append a diffstat to the log message (optional)\n" +"#diffstat = False\n" +"# Template to use for log messages (optional)\n" +"#template = {desc}\n" +"{baseurl}/rev/{node}-- {diffstat}\n" +"# Style to use (optional)\n" +"#style = foo\n" +"# The URL of the CIA notification service (optional)\n" +"# You can use mailto: URLs to send by email, eg\n" +"# mailto:cia@cia.vc\n" +"# Make sure to set email.from if you do this.\n" +"#url = http://cia.vc/\n" +"# print message instead of sending it (optional)\n" +"#test = False\n" +"\n" +"[hooks]\n" +"# one of these:\n" +"changegroup.cia = python:hgcia.hook\n" +"#incoming.cia = python:hgcia.hook\n" +"\n" +"[web]\n" +"# If you want hyperlinks (optional)\n" +"baseurl = http://server/path/to/repo\n" +msgstr "" + +msgid " A CIA message " +msgstr "" + +msgid " CIA notification class " +msgstr "" + +#, python-format +msgid "hgcia: sending update to %s\n" +msgstr "" + +msgid " send CIA notification " +msgstr "" + +msgid "email.from must be defined when sending by email" +msgstr "" + +msgid "cia: no user specified" +msgstr "cia: ingen bruger angivet" + +msgid "cia: no project specified" +msgstr "cia: intet project angivet" + +msgid "" +"browsing the repository in a graphical way\n" +"\n" +"The hgk extension allows browsing the history of a repository in a\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" +"not distributed with Mercurial.)\n" +"\n" +"hgk consists of two parts: a Tcl script that does the displaying and\n" +"querying of information, and an extension to mercurial named hgk.py,\n" +"which provides hooks for hgk to get information. hgk can be found in\n" +"the contrib directory, and hgk.py can be found in the hgext directory.\n" +"\n" +"To load the hgext.py extension, add it to your .hgrc file (you have\n" +"to use your global $HOME/.hgrc file, not one in a repository). You\n" +"can specify an absolute path:\n" +"\n" +" [extensions]\n" +" hgk=/usr/local/lib/hgk.py\n" +"\n" +"Mercurial can also scan the default python library path for a file\n" +"named 'hgk.py' if you set hgk empty:\n" +"\n" +" [extensions]\n" +" hgk=\n" +"\n" +"The hg view command will launch the hgk Tcl script. For this command\n" +"to work, hgk must be in your search path. Alternately, you can\n" +"specify the path to hgk in your .hgrc file:\n" +"\n" +" [hgk]\n" +" path=/location/of/hgk\n" +"\n" +"hgk can make use of the extdiff extension to visualize revisions.\n" +"Assuming you had already configured extdiff vdiff command, just add:\n" +"\n" +" [hgk]\n" +" vdiff=vdiff\n" +"\n" +"Revisions context menu will now display additional entries to fire\n" +"vdiff on hovered and selected revisions." +msgstr "" + +msgid "diff trees from two commits" +msgstr "" + +msgid "output common ancestor information" +msgstr "" + +msgid "cat a specific revision" +msgstr "" + +msgid "cat-file: type or revision not supplied\n" +msgstr "" + +msgid "aborting hg cat-file only understands commits\n" +msgstr "" + +msgid "parse given revisions" +msgstr "" + +msgid "print revisions" +msgstr "" + +msgid "print extension options" +msgstr "" + +msgid "start interactive history viewer" +msgstr "" + +msgid "hg view [-l LIMIT] [REVRANGE]" +msgstr "" + +msgid "generate patch" +msgstr "" + +msgid "recursive" +msgstr "" + +msgid "pretty" +msgstr "" + +msgid "stdin" +msgstr "" + +msgid "detect copies" +msgstr "" + +msgid "search" +msgstr "søg" + +msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." +msgstr "" + +msgid "hg debug-cat-file [OPTION]... TYPE FILE" +msgstr "" + +msgid "hg debug-config" +msgstr "" + +msgid "hg debug-merge-base node node" +msgstr "" + +msgid "ignored" +msgstr "Ignoreret" + +msgid "hg debug-rev-parse REV" +msgstr "" + +msgid "header" +msgstr "" + +msgid "topo-order" +msgstr "" + +msgid "parents" +msgstr "" + +msgid "max-count" +msgstr "" + +msgid "hg debug-rev-list [options] revs" +msgstr "" + +msgid "" +"syntax highlighting in hgweb, based on Pygments\n" +"\n" +"It depends on the pygments syntax highlighting library:\n" +"http://pygments.org/\n" +"\n" +"To enable the extension add this to hgrc:\n" +"\n" +"[extensions]\n" +"hgext.highlight =\n" +"\n" +"There is a single configuration option:\n" +"\n" +"[web]\n" +"pygments_style = <style>\n" +"\n" +"The default is 'colorful'.\n" +"\n" +"-- Adam Hupp <adam@hupp.org>\n" +msgstr "" + +msgid "inotify-based status acceleration for Linux systems\n" +msgstr "" + +msgid "start an inotify server for this repository" +msgstr "" + +msgid "(found dead inotify server socket; removing it)\n" +msgstr "" + +msgid "(starting inotify server)\n" +msgstr "" + +#, python-format +msgid "could not start inotify server: %s\n" +msgstr "" + +#, python-format +msgid "could not talk to new inotify server: %s\n" +msgstr "" + +msgid "(inotify server not running)\n" +msgstr "" + +#, python-format +msgid "failed to contact inotify server: %s\n" +msgstr "" + +msgid "run server in background" +msgstr "" + +msgid "used internally by daemon mode" +msgstr "" + +msgid "minutes to sit idle before exiting" +msgstr "" + +msgid "name of file to write process ID to" +msgstr "" + +msgid "hg inserve [OPT]..." +msgstr "" + +#, python-format +msgid "(inotify: received response from incompatible server version %d)\n" +msgstr "" + +msgid "this system does not seem to support inotify" +msgstr "" + +#, python-format +msgid "*** the current per-user limit on the number of inotify watches is %s\n" +msgstr "" + +msgid "*** this limit is too low to watch every directory in this repository\n" +msgstr "" + +msgid "*** counting directories: " +msgstr "" + +#, python-format +msgid "found %d\n" +msgstr "" + +#, python-format +msgid "*** to raise the limit from %d to %d (run as root):\n" +msgstr "" + +#, python-format +msgid "*** echo %d > %s\n" +msgstr "" + +#, python-format +msgid "cannot watch %s until inotify watch limit is raised" +msgstr "" + +#, python-format +msgid "inotify service not available: %s" +msgstr "" + +#, python-format +msgid "watching %r\n" +msgstr "" + +#, python-format +msgid "watching directories under %r\n" +msgstr "" + +#, python-format +msgid "status: %r dir(%d) -> %s\n" +msgstr "" + +#, python-format +msgid "status: %r %s -> %s\n" +msgstr "" + +#, python-format +msgid "%s dirstate reload\n" +msgstr "" + +#, python-format +msgid "%s end dirstate reload\n" +msgstr "" + +msgid "rescanning due to .hgignore change\n" +msgstr "" + +#, python-format +msgid "%s event: created %s\n" +msgstr "" + +#, python-format +msgid "%s event: deleted %s\n" +msgstr "" + +#, python-format +msgid "%s event: modified %s\n" +msgstr "" + +#, python-format +msgid "filesystem containing %s was unmounted\n" +msgstr "" + +#, python-format +msgid "%s readable: %d bytes\n" +msgstr "" + +#, python-format +msgid "%s below threshold - unhooking\n" +msgstr "" + +#, python-format +msgid "%s reading %d events\n" +msgstr "" + +#, python-format +msgid "%s hooking back up with %d bytes readable\n" +msgstr "" + +#, python-format +msgid "%s processing %d deferred events as %d\n" +msgstr "" + +#, python-format +msgid "could not start server: %s" +msgstr "" + +#, python-format +msgid "received query from incompatible client version %d\n" +msgstr "" + +#, python-format +msgid "answering query for %r\n" +msgstr "" + +msgid "finished setup\n" +msgstr "" + +msgid "polling: no timeout\n" +msgstr "" + +#, python-format +msgid "polling: %sms timeout\n" +msgstr "" + +#, python-format +msgid "interhg: invalid pattern for %s: %s\n" +msgstr "" + +#, python-format +msgid "interhg: invalid regexp for %s: %s\n" +msgstr "" + +msgid "" +"keyword expansion in local repositories\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$\n" +"in tracked text files selected by your configuration.\n" +"\n" +"Keywords are only expanded in local repositories and not stored in\n" +"the change history. The mechanism can be regarded as a convenience\n" +"for the current user or for archive distribution.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections\n" +"of hgrc files.\n" +"\n" +"Example:\n" +"\n" +" [keyword]\n" +" # expand keywords in every python file except those matching \"x*\"\n" +" **.py =\n" +" x* = ignore\n" +"\n" +"Note: the more specific you are in your filename patterns\n" +" the less you lose speed in huge repos.\n" +"\n" +"For [keywordmaps] template mapping and expansion demonstration and\n" +"control run \"hg kwdemo\".\n" +"\n" +"An additional date template filter {date|utcdate} is provided.\n" +"\n" +"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" +"with customized keywords and templates.\n" +"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"\n" +"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +"the risk of inadvertedly storing expanded keywords in the change history.\n" +"\n" +"To force expansion after enabling it, or a configuration change, run\n" +"\"hg kwexpand\".\n" +"\n" +"Also, when committing with the record extension or using mq's qrecord, be " +"aware\n" +"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" +"question to update keyword expansions after all changes have been checked " +"in.\n" +"\n" +"Expansions spanning more than one line and incremental expansions,\n" +"like CVS' $Log$, are not supported. A keyword template map\n" +"\"Log = {desc}\" expands to the first line of the changeset description.\n" +msgstr "" + +msgid "Returns hgdate in cvs-like UTC format." +msgstr "" + +msgid "" +"\n" +" Sets up keyword templates, corresponding keyword regex, and\n" +" provides keyword substitution functions.\n" +" " +msgstr "" + +msgid "Replaces keywords in data with expanded template." +msgstr "" + +msgid "Returns data with keywords expanded." +msgstr "" + +msgid "" +"Returns true if path matches [keyword] pattern\n" +" and is not a symbolic link.\n" +" Caveat: localrepository._link fails on Windows." +msgstr "" + +msgid "Overwrites selected files expanding/shrinking keywords." +msgstr "" + +#, python-format +msgid "overwriting %s %s keywords\n" +msgstr "" + +msgid "Unconditionally removes all keyword substitutions from text." +msgstr "" + +msgid "Returns text with all keyword substitutions removed." +msgstr "" + +msgid "Returns lines with keyword substitutions removed." +msgstr "" + +msgid "" +"If in restricted mode returns data read from wdir with\n" +" keyword substitutions removed." +msgstr "" + +msgid "" +"\n" +" Subclass of filelog to hook into its read, add, cmp methods.\n" +" Keywords are \"stored\" unexpanded, and processed on reading.\n" +" " +msgstr "" + +msgid "Expands keywords when reading filelog." +msgstr "" + +msgid "Removes keyword substitutions when adding to filelog." +msgstr "" + +msgid "Removes keyword substitutions for comparison." +msgstr "" + +msgid "" +"Bails out if [keyword] configuration is not active.\n" +" Returns status of working directory." +msgstr "" + +msgid "[keyword] patterns cannot match" +msgstr "" + +msgid "no [keyword] patterns configured" +msgstr "" + +msgid "Selects files and passes them to kwtemplater.overwrite." +msgstr "" + +msgid "" +"print [keywordmaps] configuration and an expansion example\n" +"\n" +" Show current, custom, or default keyword template maps\n" +" and their expansion.\n" +"\n" +" Extend current configuration by specifying maps as arguments\n" +" and optionally by reading from an additional hgrc file.\n" +"\n" +" Override current keyword template maps with \"default\" option.\n" +" " +msgstr "" + +#, python-format +msgid "" +"\n" +"\t%s\n" +msgstr "" + +#, python-format +msgid "creating temporary repo at %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"%s keywords written to %s:\n" +msgstr "" + +msgid "unhooked all commit hooks\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"removing temporary repo %s\n" +msgstr "" + +msgid "" +"expand keywords in working directory\n" +"\n" +" Run after (re)enabling keyword expansion.\n" +"\n" +" kwexpand refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"print files currently configured for keyword expansion\n" +"\n" +" Crosscheck which files in working directory are potential targets for\n" +" keyword expansion.\n" +" That is, files matched by [keyword] config patterns but not symlinks.\n" +" " +msgstr "" + +msgid "" +"revert expanded keywords in working directory\n" +"\n" +" Run before changing/disabling active keywords\n" +" or if you experience problems with \"hg import\" or \"hg merge\".\n" +"\n" +" kwshrink refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"Collects [keyword] config in kwtools.\n" +" Monkeypatches dispatch._parse if needed." +msgstr "" + +msgid "Monkeypatch dispatch._parse to obtain running hg command." +msgstr "" + +msgid "" +"Sets up repo as kwrepo for keyword substitution.\n" +" Overrides file method to return kwfilelog instead of filelog\n" +" if file matches user configuration.\n" +" Wraps commit to overwrite configured files with updated\n" +" keyword substitutions.\n" +" Monkeypatches patch and webcommands." +msgstr "" + +msgid "" +"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" +" rejects or conflicts due to expanded keywords in working dir." +msgstr "" + +msgid "" +"Monkeypatch patch.diff to avoid expansion except when\n" +" comparing against working dir." +msgstr "" + +msgid "Wraps webcommands.x turning off keyword expansion." +msgstr "" + +msgid "show default keyword template maps" +msgstr "" + +msgid "read maps from rcfile" +msgstr "" + +msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." +msgstr "" + +msgid "hg kwexpand [OPTION]... [FILE]..." +msgstr "" + +msgid "show keyword status flags of all files" +msgstr "" + +msgid "show files excluded from expansion" +msgstr "" + +msgid "additionally show untracked files" +msgstr "" + +msgid "hg kwfiles [OPTION]... [FILE]..." +msgstr "" + +msgid "hg kwshrink [OPTION]... [FILE]..." +msgstr "" + +msgid "" +"patch management and development\n" +"\n" +"This extension lets you work with a stack of patches in a Mercurial\n" +"repository. It manages two stacks of patches - all known patches, and\n" +"applied patches (subset of known patches).\n" +"\n" +"Known patches are represented as patch files in the .hg/patches\n" +"directory. Applied patches are both patch files and changesets.\n" +"\n" +"Common tasks (use \"hg help command\" for more details):\n" +"\n" +"prepare repository to work with patches qinit\n" +"create new patch qnew\n" +"import existing patch qimport\n" +"\n" +"print patch series qseries\n" +"print applied patches qapplied\n" +"print name of top applied patch qtop\n" +"\n" +"add known patch to applied stack qpush\n" +"remove patch from applied stack qpop\n" +"refresh contents of top applied patch qrefresh\n" +msgstr "" +"udvikling og håndtering af patches\n" +"\n" +"Denne udvidelse lader dig arbejde med en stak af patches i et\n" +"Mercurial repository. Den håndterer to stakke af patches - alle kendte\n" +"patches og alle anvendte patches (en delmængde af de kendte patches).\n" +"\n" +"Kendte patches er repræsenteret som patch-filer i .hg/patches\n" +"biblioteket. Anvendte patches er både patch-filer og Mercurial\n" +"ændringer.\n" +"\n" +"Almindelige opgaver (brug \"hg help kommado\" for flere detaljer):\n" +"\n" +"forbered repository til at arbejde med patches qinit\n" +"opret ny patch qnew\n" +"importer eksisterende patch qimport\n" +"\n" +"list patch-serien qseries\n" +"list anvendte patches qapplied\n" +"list navnet på den øverste patch qtop\n" +"\n" +"anvend og put patch på stakken qpush\n" +"fjern patch fra stakken qpop\n" +"genopfrisk indholdet af den øverste patch qrefresh\n" + +msgid "" +"Update all references to a field in the patch header.\n" +" If none found, add it email style." +msgstr "" + +msgid "" +"Remove existing message, keeping the rest of the comments fields.\n" +" If comments contains 'subject: ', message will prepend\n" +" the field and a blank line." +msgstr "" + +#, python-format +msgid "%s appears more than once in %s" +msgstr "%s findes mere end én gang i %s" + +msgid "guard cannot be an empty string" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid character: %r" +msgstr "" + +#, python-format +msgid "invalid character in guard %r: %r" +msgstr "" + +#, python-format +msgid "active guards: %s\n" +msgstr "" + +#, python-format +msgid "guard %r too short" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid char" +msgstr "" + +#, python-format +msgid "allowing %s - no guards in effect\n" +msgstr "" + +#, python-format +msgid "allowing %s - no matching negative guards\n" +msgstr "" + +#, python-format +msgid "allowing %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - no matching guards\n" +msgstr "" + +#, python-format +msgid "error removing undo: %s\n" +msgstr "" + +#, python-format +msgid "apply failed for patch %s" +msgstr "" + +#, python-format +msgid "patch didn't work out, merging %s\n" +msgstr "" + +#, python-format +msgid "update returned %d" +msgstr "" + +msgid "repo commit failed" +msgstr "" + +#, python-format +msgid "unable to read %s" +msgstr "ikke i stand til at læse %s" + +#, python-format +msgid "patch %s does not exist\n" +msgstr "rettelsen %s findes ikke\n" + +#, python-format +msgid "patch %s is not applied\n" +msgstr "rettelsen %s er ikke anvendt\n" + +msgid "" +"Apply patchfile to the working directory.\n" +" patchfile: file name of patch" +msgstr "" + +msgid "patch failed, unable to continue (try -v)\n" +msgstr "" + +#, python-format +msgid "applying %s\n" +msgstr "anvender %s\n" + +#, python-format +msgid "Unable to read %s\n" +msgstr "" + +#, python-format +msgid "imported patch %s\n" +msgstr "importeret rettelse %s\n" + +#, python-format +msgid "" +"\n" +"imported patch %s" +msgstr "" +"\n" +"importeret rettelse %s" + +#, python-format +msgid "patch %s is empty\n" +msgstr "rettelse %s er tom\n" + +msgid "patch failed, rejects left in working dir\n" +msgstr "" + +msgid "fuzz found when applying patch, stopping\n" +msgstr "" + +#, python-format +msgid "revision %d is not managed" +msgstr "" + +#, python-format +msgid "cannot delete revision %d above applied patches" +msgstr "kan ikke slette revision %d ovenover anvendte rettelser" + +msgid "qdelete requires at least one revision or patch name" +msgstr "" + +#, python-format +msgid "cannot delete applied patch %s" +msgstr "kan ikke slette den anvendte rettelse %s" + +#, python-format +msgid "patch %s not in series file" +msgstr "rettelse %s er ikke i series filen" + +msgid "no patches applied" +msgstr "ingen rettelser anvendt" + +msgid "working directory revision is not qtip" +msgstr "" + +msgid "local changes found, refresh first" +msgstr "lokale ændringer fundet, genopfrisk først" + +msgid "local changes found" +msgstr "lokale ændringer fundet" + +#, python-format +msgid "\"%s\" cannot be used as the name of a patch" +msgstr "\"%s\" kan ikke bruges som navnet på en rettelse" + +msgid "" +"options:\n" +" msg: a string or a no-argument function returning a string\n" +" " +msgstr "" + +#, python-format +msgid "patch \"%s\" already exists" +msgstr "rettelsen \"%s\" findes allerede" + +#, python-format +msgid "error unlinking %s\n" +msgstr "fejl ved sletning af %s\n" + +msgid "returns (index, rev, patch)" +msgstr "" + +#, python-format +msgid "patch name \"%s\" is ambiguous:\n" +msgstr "rettelsen \"%s\" er tvetydigt:\n" + +#, python-format +msgid "patch %s not in series" +msgstr "" + +msgid "(working directory not at tip)\n" +msgstr "" + +msgid "no patches in series\n" +msgstr "ingen patches i serien\n" + +#, python-format +msgid "cannot push to a previous patch: %s" +msgstr "" + +#, python-format +msgid "qpush: %s is already at the top\n" +msgstr "" + +#, python-format +msgid "guarded by %r" +msgstr "" + +msgid "no matching guards" +msgstr "" + +#, python-format +msgid "cannot push '%s' - %s\n" +msgstr "kan ikke skubbe '%s' - %s\n" + +msgid "all patches are currently applied\n" +msgstr "alle rettelser er i øjeblikket anvendt\n" + +msgid "patch series already fully applied\n" +msgstr "" + +msgid "cleaning up working directory..." +msgstr "rydder op i arbejdsbiblioteket..." + +#, python-format +msgid "errors during apply, please fix and refresh %s\n" +msgstr "" + +#, python-format +msgid "now at: %s\n" +msgstr "nu ved: %s\n" + +#, python-format +msgid "patch %s is not applied" +msgstr "rettelse %s er ikke anvendt" + +msgid "no patches applied\n" +msgstr "ingen rettelser anvendt\n" + +#, python-format +msgid "qpop: %s is already at the top\n" +msgstr "" + +msgid "qpop: forcing dirstate update\n" +msgstr "" + +#, python-format +msgid "trying to pop unknown node %s" +msgstr "" + +msgid "popping would remove a revision not managed by this patch queue" +msgstr "" + +msgid "deletions found between repo revs" +msgstr "" + +msgid "patch queue now empty\n" +msgstr "rettelseskøen er nu tom\n" + +msgid "cannot refresh a revision with children" +msgstr "" + +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" +msgstr "" + +msgid "patch queue directory already exists" +msgstr "" + +#, python-format +msgid "patch %s is not in series file" +msgstr "rettelse %s er ikke i series filen" + +msgid "No saved patch data found\n" +msgstr "" + +#, python-format +msgid "restoring status: %s\n" +msgstr "genopretter status: %s\n" + +msgid "save entry has children, leaving it alone\n" +msgstr "" + +#, python-format +msgid "removing save entry %s\n" +msgstr "" + +#, python-format +msgid "saved queue repository parents: %s %s\n" +msgstr "" + +msgid "queue directory updating\n" +msgstr "" + +msgid "Unable to load queue repository\n" +msgstr "" + +msgid "save: no patches applied, exiting\n" +msgstr "" + +msgid "status is already saved\n" +msgstr "" + +msgid "hg patches saved state" +msgstr "" + +msgid "repo commit failed\n" +msgstr "" + +msgid "" +"If all_patches is False, return the index of the next pushable patch\n" +" in the series, or the series length. If all_patches is True, return " +"the\n" +" index of the first patch past the last applied one.\n" +" " +msgstr "" + +#, python-format +msgid "patch %s is already in the series file" +msgstr "" + +msgid "option \"-r\" not valid when importing files" +msgstr "" + +msgid "option \"-n\" not valid when importing multiple patches" +msgstr "" + +#, python-format +msgid "revision %d is the root of more than one branch" +msgstr "" + +#, python-format +msgid "revision %d is already managed" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of the queue" +msgstr "" + +#, python-format +msgid "revision %d has unmanaged children" +msgstr "" + +#, python-format +msgid "cannot import merge revision %d" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of %d" +msgstr "" + +msgid "-e is incompatible with import from -" +msgstr "" + +#, python-format +msgid "patch %s does not exist" +msgstr "rettelse %s eksisterer ikke" + +msgid "need --name to import a patch from -" +msgstr "" + +#, python-format +msgid "adding %s to series file\n" +msgstr "tilføjer %s til series filen\n" + +msgid "" +"remove patches from queue\n" +"\n" +" The patches must not be applied, unless they are arguments to\n" +" the --rev parameter. At least one patch or revision is required.\n" +"\n" +" With --rev, mq will stop managing the named revisions (converting\n" +" them to regular mercurial changesets). The qfinish command should be\n" +" used as an alternative for qdel -r, as the latter option is deprecated.\n" +"\n" +" With --keep, the patch files are preserved in the patch directory." +msgstr "" + +msgid "print the patches already applied" +msgstr "udskriver rettelserne som allerede er anvendt" + +msgid "print the patches not yet applied" +msgstr "udskriver rettelserne som ikke er anvendt endnu" + +msgid "" +"import a patch\n" +"\n" +" The patch is inserted into the series after the last applied patch.\n" +" If no patches have been applied, qimport prepends the patch\n" +" to the series.\n" +"\n" +" The patch will have the same name as its source file unless you\n" +" give it a new one with --name.\n" +"\n" +" You can register an existing patch inside the patch directory\n" +" with the --existing flag.\n" +"\n" +" With --force, an existing patch of the same name will be overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with --rev\n" +" (e.g. qimport --rev tip -n patch will place tip under mq control).\n" +" With --git, patches imported with --rev will use the git diff\n" +" format. See the diffs help topic for information on why this is\n" +" important for preserving rename/copy information and permission " +"changes.\n" +" " +msgstr "" + +msgid "" +"init a new queue repository\n" +"\n" +" The queue repository is unversioned by default. If -c is\n" +" specified, qinit will create a separate nested repository\n" +" for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one).\n" +" You can use qcommit to commit changes to this queue repository." +msgstr "" + +msgid "" +"clone main and patch repository at same time\n" +"\n" +" If source is local, destination will have no patches applied. If\n" +" source is remote, this command can not check if patches are\n" +" applied in source, so cannot guarantee that patches are not\n" +" applied in destination. If you clone remote repository, be sure\n" +" before that it has no patches applied.\n" +"\n" +" Source patch repository is looked for in <src>/.hg/patches by\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested mercurial repository, as\n" +" would be created by qinit -c.\n" +" " +msgstr "" + +msgid "versioned patch repository not found (see qinit -c)" +msgstr "versionsstyret arkiv til rettelser blev ikke fundet (se qinit -c)" + +msgid "cloning main repo\n" +msgstr "kloner hovedarkiv\n" + +msgid "cloning patch repo\n" +msgstr "kloner rettelsesarkiv\n" + +msgid "stripping applied patches from destination repo\n" +msgstr "" + +msgid "updating destination repo\n" +msgstr "" + +msgid "commit changes in the queue repository" +msgstr "" + +msgid "print the entire series file" +msgstr "udskriver hele series filen" + +msgid "print the name of the current patch" +msgstr "udskriver navnet på den nuværende rettelse" + +msgid "print the name of the next patch" +msgstr "udskriver navnet på den næste rettelse" + +msgid "all patches applied\n" +msgstr "alle rettelser er anvendt\n" + +msgid "print the name of the previous patch" +msgstr "udskriver navnet på den forgående rettelse" + +msgid "only one patch applied\n" +msgstr "kun én rettelse er anvendt\n" + +msgid "" +"create a new patch\n" +"\n" +" qnew creates a new patch on top of the currently-applied patch (if " +"any).\n" +" It will refuse to run if there are any outstanding changes unless -f is\n" +" specified, in which case the patch will be initialized with them. You\n" +" may also use -I, -X, and/or a list of files after the patch name to add\n" +" only changes to matching files to the new patch, leaving the rest as\n" +" uncommitted modifications.\n" +"\n" +" -u and -d can be used to set the (given) user and date, respectively.\n" +" -U and -D set user to current user and date to current date.\n" +"\n" +" -e, -m or -l set the patch header as well as the commit message. If " +"none\n" +" is specified, the header is empty and the commit message is '[mq]: " +"PATCH'.\n" +"\n" +" Use the --git option to keep the patch in the git extended diff\n" +" format. Read the diffs help topic for more information on why this\n" +" is important for preserving permission changes and copy/rename\n" +" information.\n" +" " +msgstr "" + +msgid "" +"update the current patch\n" +"\n" +" If any file patterns are provided, the refreshed patch will contain " +"only\n" +" the modifications that match those patterns; the remaining " +"modifications\n" +" will remain in the working directory.\n" +"\n" +" If --short is specified, files currently included in the patch will\n" +" be refreshed just like matched files and remain in the patch.\n" +"\n" +" hg add/remove/copy/rename work as usual, though you might want to use\n" +" git-style patches (--git or [diff] git=1) to track copies and renames.\n" +" See the diffs help topic for more information on the git diff format.\n" +" " +msgstr "" + +msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" +msgstr "" + +msgid "" +"diff of the current patch and subsequent modifications\n" +"\n" +" Shows a diff which includes the current patch as well as any changes " +"which\n" +" have been made in the working directory since the last refresh (thus\n" +" showing what the current patch would become after a qrefresh).\n" +"\n" +" Use 'hg diff' if you only want to see the changes made since the last\n" +" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" +" current patch without including changes made since the qrefresh.\n" +" " +msgstr "" + +msgid "" +"fold the named patches into the current patch\n" +"\n" +" Patches must not yet be applied. Each patch will be successively\n" +" applied to the current patch in the order given. If all the\n" +" patches apply successfully, the current patch will be refreshed\n" +" with the new cumulative patch, and the folded patches will\n" +" be deleted. With -k/--keep, the folded patch files will not\n" +" be removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with\n" +" the current patch header, separated by a line of '* * *'." +msgstr "" + +msgid "qfold requires at least one patch name" +msgstr "" + +msgid "No patches applied" +msgstr "Ingen rettelser anvendt" + +#, python-format +msgid "Skipping already folded patch %s" +msgstr "" + +#, python-format +msgid "qfold cannot fold already applied patch %s" +msgstr "" + +#, python-format +msgid "Error folding patch %s" +msgstr "" + +msgid "push or pop patches until named patch is at top of stack" +msgstr "" + +msgid "" +"set or print guards for a patch\n" +"\n" +" Guards control whether a patch can be pushed. A patch with no\n" +" guards is always pushed. A patch with a positive guard (\"+foo\") is\n" +" pushed only if the qselect command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" has activated it.\n" +"\n" +" With no arguments, print the currently active guards.\n" +" With arguments, set guards for the named patch.\n" +" NOTE: Specifying negative guards now requires '--'.\n" +"\n" +" To set guards on another patch:\n" +" hg qguard -- other.patch +2.6.17 -stable\n" +" " +msgstr "" + +msgid "cannot mix -l/--list with options or arguments" +msgstr "" + +msgid "no patch to work with" +msgstr "" + +#, python-format +msgid "no patch named %s" +msgstr "ingen patch ved navn %s" + +msgid "print the header of the topmost or specified patch" +msgstr "" + +msgid "" +"push the next patch onto the stack\n" +"\n" +" When --force is applied, all local changes in patched files will be " +"lost.\n" +" " +msgstr "" + +msgid "no saved queues found, please use -n\n" +msgstr "" + +#, python-format +msgid "merging with queue at: %s\n" +msgstr "" + +msgid "" +"pop the current patch off the stack\n" +"\n" +" By default, pops off the top of the patch stack. If given a patch name,\n" +" keeps popping off patches until the named patch is at the top of the " +"stack.\n" +" " +msgstr "" + +#, python-format +msgid "using patch queue: %s\n" +msgstr "" + +msgid "" +"rename a patch\n" +"\n" +" With one argument, renames the current patch to PATCH1.\n" +" With two arguments, renames PATCH1 to PATCH2." +msgstr "" + +#, python-format +msgid "%s already exists" +msgstr "%s eksisterer allerede" + +#, python-format +msgid "A patch named %s already exists in the series file" +msgstr "" + +msgid "restore the queue state saved by a rev" +msgstr "" + +msgid "save current queue state" +msgstr "" + +#, python-format +msgid "destination %s exists and is not a directory" +msgstr "" + +#, python-format +msgid "destination %s exists, use -f to force" +msgstr "" + +#, python-format +msgid "copy %s to %s\n" +msgstr "" + +msgid "" +"strip a revision and all its descendants from the repository\n" +"\n" +" If one of the working dir's parent revisions is stripped, the working\n" +" directory will be updated to the parent of the stripped revision.\n" +" " +msgstr "" + +msgid "" +"set or print guarded patches to push\n" +"\n" +" Use the qguard command to set or print guards on patch, then use\n" +" qselect to tell mq which guards to use. A patch will be pushed if it\n" +" has no guards or any positive guards match the currently selected " +"guard,\n" +" but will not be pushed if any negative guards match the current guard.\n" +" For example:\n" +"\n" +" qguard foo.patch -stable (negative guard)\n" +" qguard bar.patch +stable (positive guard)\n" +" qselect stable\n" +"\n" +" This activates the \"stable\" guard. mq will skip foo.patch (because\n" +" it has a negative match) but push bar.patch (because it\n" +" has a positive match).\n" +"\n" +" With no arguments, prints the currently active guards.\n" +" With one argument, sets the active guard.\n" +"\n" +" Use -n/--none to deactivate guards (no other arguments needed).\n" +" When no guards are active, patches with positive guards are skipped\n" +" and patches with negative guards are pushed.\n" +"\n" +" qselect can change the guards on applied patches. It does not pop\n" +" guarded patches by default. Use --pop to pop back to the last applied\n" +" patch that is not guarded. Use --reapply (which implies --pop) to push\n" +" back to the current patch afterwards, but skip guarded patches.\n" +"\n" +" Use -s/--series to print a list of all guards in the series file (no\n" +" other arguments needed). Use -v for more information." +msgstr "" + +msgid "guards deactivated\n" +msgstr "" + +#, python-format +msgid "number of unguarded, unapplied patches has changed from %d to %d\n" +msgstr "" + +#, python-format +msgid "number of guarded, applied patches has changed from %d to %d\n" +msgstr "" + +msgid "guards in series file:\n" +msgstr "" + +msgid "no guards in series file\n" +msgstr "" + +msgid "active guards:\n" +msgstr "" + +msgid "no active guards\n" +msgstr "" + +msgid "popping guarded patches\n" +msgstr "" + +msgid "reapplying unguarded patches\n" +msgstr "" + +msgid "" +"move applied patches into repository history\n" +"\n" +" Finishes the specified revisions (corresponding to applied patches) by\n" +" moving them out of mq control into regular repository history.\n" +"\n" +" Accepts a revision range or the --applied option. If --applied is\n" +" specified, all applied mq revisions are removed from mq control.\n" +" Otherwise, the given revisions must be at the base of the stack of\n" +" applied patches.\n" +"\n" +" This can be especially useful if your changes have been applied to an\n" +" upstream repository, or if you are about to push your changes to " +"upstream.\n" +" " +msgstr "" + +msgid "no revisions specified" +msgstr "" + +msgid "cannot commit over an applied mq patch" +msgstr "" + +msgid "source has mq patches applied" +msgstr "" + +#, python-format +msgid "mq status file refers to unknown node %s\n" +msgstr "" + +#, python-format +msgid "Tag %s overrides mq patch of the same name\n" +msgstr "" + +msgid "cannot import over an applied patch" +msgstr "" + +msgid "print first line of patch header" +msgstr "" + +msgid "hg qapplied [-s] [PATCH]" +msgstr "" + +msgid "use pull protocol to copy metadata" +msgstr "" + +msgid "do not update the new working directories" +msgstr "" + +msgid "use uncompressed transfer (fast over LAN)" +msgstr "" + +msgid "location of source patch repo" +msgstr "" + +msgid "hg qclone [OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "hg qcommit [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qdiff [OPTION]... [FILE]..." +msgstr "" + +msgid "keep patch file" +msgstr "" + +msgid "stop managing a revision" +msgstr "" + +msgid "hg qdelete [-k] [-r REV]... [PATCH]..." +msgstr "" + +msgid "edit patch header" +msgstr "" + +msgid "keep folded patch files" +msgstr "" + +msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." +msgstr "" + +msgid "overwrite any local changes" +msgstr "" + +msgid "hg qgoto [OPTION]... PATCH" +msgstr "" + +msgid "list all patches and guards" +msgstr "" + +msgid "drop all guards" +msgstr "" + +msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." +msgstr "" + +msgid "hg qheader [PATCH]" +msgstr "" + +msgid "import file in patch dir" +msgstr "" + +msgid "patch file name" +msgstr "patch navn" + +msgid "overwrite existing files" +msgstr "" + +msgid "place existing revisions under mq control" +msgstr "" + +msgid "use git extended diff format" +msgstr "" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." +msgstr "" + +msgid "create queue repository" +msgstr "opret kø-repository" + +msgid "hg qinit [-c]" +msgstr "" + +msgid "import uncommitted changes into patch" +msgstr "" + +msgid "add \"From: <current user>\" to patch" +msgstr "" + +msgid "add \"From: <given user>\" to patch" +msgstr "" + +msgid "add \"Date: <current date>\" to patch" +msgstr "" + +msgid "add \"Date: <given date>\" to patch" +msgstr "" + +msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." +msgstr "" + +msgid "hg qnext [-s]" +msgstr "" + +msgid "hg qprev [-s]" +msgstr "" + +msgid "pop all patches" +msgstr "" + +msgid "queue name to pop" +msgstr "" + +msgid "forget any local changes" +msgstr "" + +msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" +msgstr "" + +msgid "apply if the patch has rejects" +msgstr "" + +msgid "list patch name in commit text" +msgstr "" + +msgid "apply all patches" +msgstr "" + +msgid "merge from another queue" +msgstr "" + +msgid "merge queue name" +msgstr "" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" +msgstr "" + +msgid "refresh only files already in the patch and specified files" +msgstr "" + +msgid "add/update \"From: <current user>\" in patch" +msgstr "" + +msgid "add/update \"From: <given user>\" in patch" +msgstr "" + +msgid "update \"Date: <current date>\" in patch (if present)" +msgstr "" + +msgid "update \"Date: <given date>\" in patch (if present)" +msgstr "" + +msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." +msgstr "" + +msgid "hg qrename PATCH1 [PATCH2]" +msgstr "" + +msgid "delete save entry" +msgstr "" + +msgid "update queue working dir" +msgstr "" + +msgid "hg qrestore [-d] [-u] REV" +msgstr "" + +msgid "copy patch directory" +msgstr "" + +msgid "copy directory name" +msgstr "" + +msgid "clear queue status file" +msgstr "" + +msgid "force copy" +msgstr "" + +msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" +msgstr "" + +msgid "disable all guards" +msgstr "" + +msgid "list all guards in series file" +msgstr "" + +msgid "pop to before first guarded applied patch" +msgstr "" + +msgid "pop, then reapply patches" +msgstr "" + +msgid "hg qselect [OPTION]... [GUARD]..." +msgstr "" + +msgid "print patches not in series" +msgstr "" + +msgid "hg qseries [-ms]" +msgstr "" + +msgid "force removal with local changes" +msgstr "" + +msgid "bundle unrelated changesets" +msgstr "" + +msgid "no backups" +msgstr "" + +msgid "hg strip [-f] [-b] [-n] REV" +msgstr "" + +msgid "hg qtop [-s]" +msgstr "" + +msgid "hg qunapplied [-s] [PATCH]" +msgstr "" + +msgid "finish all applied changesets" +msgstr "afslut alle anvendte ændringer" + +msgid "hg qfinish [-a] [REV...]" +msgstr "hg qfinish [-a] [REV...]" + +msgid "" +"hook extension to email notifications on commits/pushes\n" +"\n" +"Subscriptions can be managed through hgrc. Default mode is to print\n" +"messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure notify extension and enable in hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go in here\n" +"\n" +" config items:\n" +"\n" +" REQUIRED:\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +" OPTIONAL:\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" +" # (serve == ssh or http, push, pull, bundle)\n" +" [email]\n" +" from = user@host.com # email address to send as if none given\n" +" [web]\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +" notify config file has same format as regular hgrc. it has two\n" +" sections so you can express subscriptions in whatever way is handier\n" +" for you.\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob " +"patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber " +"emails\n" +" pattern = user@host\n" +"\n" +" glob patterns are matched against path to repo root.\n" +"\n" +" if you like, you can put notify config file in repo that users can\n" +" push changes to, they can manage their own subscriptions." +msgstr "" + +msgid "email notification class." +msgstr "" + +msgid "strip leading slashes from local path, turn into web-safe path." +msgstr "" + +msgid "try to clean up email addresses." +msgstr "" + +msgid "return list of email addresses of subscribers to this repo." +msgstr "" + +msgid "format one changeset." +msgstr "" + +msgid "true if incoming changes from this source should be skipped." +msgstr "" + +msgid "send message." +msgstr "" + +#, python-format +msgid "%s: %d new changesets" +msgstr "%s: %d nye ændringer" + +#, python-format +msgid "notify: sending %d subscribers %d changes\n" +msgstr "notify: sender %d abonnenter %d ændringer\n" + +#, python-format +msgid "" +"\n" +"diffs (truncated from %d to %d lines):\n" +"\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (%d lines):\n" +"\n" +msgstr "" + +msgid "" +"send email notifications to interested subscribers.\n" +"\n" +" if used as changegroup hook, send one email for all changesets in\n" +" changegroup. else send one email per changeset." +msgstr "" + +#, python-format +msgid "notify: no subscribers to repo %s\n" +msgstr "" + +#, python-format +msgid "notify: changes have source \"%s\" - skipping\n" +msgstr "" + +msgid "" +"browse command output with external pager\n" +"\n" +"To set the pager that should be used, set the application variable:\n" +"\n" +" [pager]\n" +" pager = LESS='FSRX' less\n" +"\n" +"If no pager is set, the pager extensions uses the environment\n" +"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" +"is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" +"by setting:\n" +"\n" +" [pager]\n" +" quiet = True\n" +"\n" +"You can disable the pager for certain commands by adding them to the\n" +"pager.ignore list:\n" +"\n" +" [pager]\n" +" ignore = version, help, update\n" +"\n" +"You can also enable the pager only for certain commands using pager.attend:\n" +"\n" +" [pager]\n" +" attend = log\n" +"\n" +"If pager.attend is present, pager.ignore will be ignored.\n" +"\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to " +"specify\n" +"them in the global .hgrc\n" +msgstr "" + +msgid "" +"use suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to\n" +"the ancestors of a specific revision.\n" +"\n" +"For example, if you can refer to a revision as \"foo\", then:\n" +"\n" +"- foo^N = Nth parent of foo:\n" +" foo^0 = foo\n" +" foo^1 = first parent of foo\n" +" foo^2 = second parent of foo\n" +" foo^ = foo^1\n" +"\n" +"- foo~N = Nth first grandparent of foo\n" +" foo~0 = foo\n" +" foo~1 = foo^1 = foo^ = first parent of foo\n" +" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" +msgstr "" + +msgid "" +"sending Mercurial changesets as a series of patch emails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" +"which describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +"the first line of the changeset description as the subject text.\n" +"The message contains two or three body parts:\n" +"\n" +" The remainder of the changeset description.\n" +"\n" +" [Optional] The result of running diffstat on the patch.\n" +"\n" +" The patch itself, as generated by \"hg export\".\n" +"\n" +"Each message refers to all of its predecessors using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in\n" +"threaded mail and news readers, and in mail archives.\n" +"\n" +"For each changeset, you will be prompted with a diffstat summary and\n" +"the changeset summary, so you can be sure you are sending the right " +"changes.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.patchbomb =\n" +"\n" +"To configure other defaults, add a section like this to your hgrc file:\n" +"\n" +" [email]\n" +" from = My Name <my@email>\n" +" to = recipient1, recipient2, ...\n" +" cc = cc1, cc2, ...\n" +" bcc = bcc1, bcc2, ...\n" +"\n" +"Then you can use the \"hg email\" command to mail a series of changesets\n" +"as a patchbomb.\n" +"\n" +"To avoid sending patches prematurely, it is a good idea to first run\n" +"the \"email\" command with the \"-n\" option (test only). You will be\n" +"prompted for an email recipient address, a subject an an introductory\n" +"message describing the patches of your patchbomb. Then when all is\n" +"done, patchbomb messages are displayed. If PAGER environment variable\n" +"is set, your pager will be fired up once for each patchbomb message, so\n" +"you can verify everything is alright.\n" +"\n" +"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" +"each patchbomb message in a pager or sending the messages directly,\n" +"it will create a UNIX mailbox file with the patch emails. This\n" +"mailbox file can be previewed with any mail user agent which supports\n" +"UNIX mbox files, i.e. with mutt:\n" +"\n" +" % mutt -R -f mbox\n" +"\n" +"When you are previewing the patchbomb messages, you can use `formail'\n" +"(a utility that is commonly installed as part of the procmail package),\n" +"to send each message out:\n" +"\n" +" % formail -s sendmail -bm -t < mbox\n" +"\n" +"That should be all. Now your patchbomb is on its way out.\n" +"\n" +"You can also either configure the method option in the email section\n" +"to be a sendmail compatable mailer or fill out the [smtp] section so\n" +"that the patchbomb extension can automatically send patchbombs directly\n" +"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" +"for details." +msgstr "" + +msgid "Please enter a valid value.\n" +msgstr "" + +msgid "does the diffstat above look okay? " +msgstr "" + +msgid "diffstat rejected" +msgstr "diffstat afvist" + +msgid "" +"send changesets by email\n" +"\n" +" By default, diffs are sent in the format generated by hg export,\n" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" +" introduction, which describes the series as a whole.\n" +"\n" +" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +" the first line of the changeset description as the subject text.\n" +" The message contains two or three body parts. First, the rest of\n" +" the changeset description. Next, (optionally) if the diffstat\n" +" program is installed, the result of running diffstat on the patch.\n" +" Finally, the patch itself, as generated by \"hg export\".\n" +"\n" +" With --outgoing, emails will be generated for patches not\n" +" found in the destination repository (or only those which are\n" +" ancestors of the specified revisions if any are provided)\n" +"\n" +" With --bundle, changesets are selected as for --outgoing,\n" +" but a single email containing a binary Mercurial bundle as an\n" +" attachment will be sent.\n" +"\n" +" Examples:\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +"\n" +" Before using this command, you will need to enable email in your hgrc.\n" +" See the [email] section in hgrc(5) for details.\n" +" " +msgstr "" + +msgid "Return the revisions present locally but not in dest" +msgstr "" + +msgid "specify at least one changeset with -r or -o" +msgstr "angiv mindst en ændring med -r eller -o" + +msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" +msgstr "" + +msgid "too many destinations" +msgstr "for mange destinationer" + +msgid "use only one form to specify the revision" +msgstr "" + +msgid "" +"\n" +"Write the introductory message for the patch series.\n" +"\n" +msgstr "" + +#, python-format +msgid "" +"This patch series consists of %d patches.\n" +"\n" +msgstr "" + +msgid "Final summary:\n" +msgstr "" + +msgid "Displaying " +msgstr "" + +msgid "Writing " +msgstr "" + +msgid "Sending " +msgstr "" + +msgid "send patches as attachments" +msgstr "" + +msgid "send patches as inline attachments" +msgstr "" + +msgid "email addresses of blind copy recipients" +msgstr "" + +msgid "email addresses of copy recipients" +msgstr "" + +msgid "add diffstat output to messages" +msgstr "" + +msgid "use the given date as the sending date" +msgstr "" + +msgid "use the given file as the series description" +msgstr "" + +msgid "email address of sender" +msgstr "" + +msgid "print messages that would be sent" +msgstr "" + +msgid "write messages to mbox file instead of sending them" +msgstr "" + +msgid "subject of first message (intro or single patch)" +msgstr "" + +msgid "email addresses of recipients" +msgstr "" + +msgid "omit hg patch header" +msgstr "" + +msgid "send changes not found in the target repository" +msgstr "" + +msgid "send changes not in target as a binary bundle" +msgstr "" + +msgid "a revision to send" +msgstr "" + +msgid "run even when remote repository is unrelated (with -b)" +msgstr "" + +msgid "a base changeset to specify instead of a destination (with -b)" +msgstr "" + +msgid "send an introduction email for a single patch" +msgstr "" + +msgid "hg email [OPTION]... [DEST]..." +msgstr "" + +msgid "" +"removes files not tracked by Mercurial\n" +"\n" +" Delete files not known to Mercurial. This is useful to test local and\n" +" uncommitted changes in an otherwise-clean source tree.\n" +"\n" +" This means that purge will delete:\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless they\n" +" contain files under source control managment\n" +" But it will leave untouched:\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" +"\n" +" If directories are given on the command line, only files in these\n" +" directories are considered.\n" +"\n" +" Be careful with purge, as you could irreversibly delete some files you\n" +" forgot to add to the repository. If you only want to print the list of\n" +" files that this program would delete, use the --print option.\n" +" " +msgstr "" + +#, python-format +msgid "%s cannot be removed" +msgstr "" + +#, python-format +msgid "warning: %s\n" +msgstr "" + +#, python-format +msgid "Removing file %s\n" +msgstr "" + +#, python-format +msgid "Removing directory %s\n" +msgstr "" + +msgid "abort if an error occurs" +msgstr "" + +msgid "purge ignored files too" +msgstr "" + +msgid "print the file names instead of deleting them" +msgstr "" + +msgid "end filenames with NUL, for use with xargs (implies -p)" +msgstr "" + +msgid "hg purge [OPTION]... [DIR]..." +msgstr "" + +msgid "" +"move sets of revisions to a different ancestor\n" +"\n" +"This extension lets you rebase changesets in an existing Mercurial " +"repository.\n" +"\n" +"For more information:\n" +"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +msgstr "" + +msgid "return the correct ancestor" +msgstr "" + +msgid "first revision, do not change ancestor\n" +msgstr "" + +msgid "" +"move changeset (and descendants) to a different branch\n" +"\n" +" Rebase uses repeated merging to graft changesets from one part of " +"history\n" +" onto another. This can be useful for linearizing local changes relative " +"to\n" +" a master development tree.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be " +"continued\n" +" with --continue or aborted with --abort.\n" +" " +msgstr "" + +msgid "cannot use both keepbranches and extrafn" +msgstr "" + +msgid "cannot use both abort and continue" +msgstr "" + +msgid "cannot use collapse with continue or abort" +msgstr "" + +msgid "abort and continue do not allow specifying revisions" +msgstr "" + +msgid "cannot specify both a revision and a base" +msgstr "" + +msgid "nothing to rebase\n" +msgstr "" + +msgid "rebase merging completed\n" +msgstr "" + +msgid "warning: new changesets detected on source branch, not stripping\n" +msgstr "" + +msgid "rebase completed\n" +msgstr "" + +#, python-format +msgid "%d revisions have been skipped\n" +msgstr "" + +msgid "" +"Skip commit if collapsing has been required and rev is not the last\n" +" revision, commit otherwise\n" +" " +msgstr "" + +msgid " set parents\n" +msgstr "" + +msgid "Rebase a single revision" +msgstr "" + +#, python-format +msgid "rebasing %d:%s\n" +msgstr "" + +#, python-format +msgid " future parents are %d and %d\n" +msgstr "" + +#, python-format +msgid " update to %d:%s\n" +msgstr " opdater til %d:%s\n" + +msgid " already in target\n" +msgstr "" + +#, python-format +msgid " merge against %d:%s\n" +msgstr "" + +msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" +msgstr "" + +msgid "resuming interrupted rebase\n" +msgstr "" + +#, python-format +msgid "no changes, revision %d skipped\n" +msgstr "" + +#, python-format +msgid "next revision set to %s\n" +msgstr "" + +msgid "Return the new parent relationship of the revision that will be rebased" +msgstr "" + +#, python-format +msgid "cannot use revision %d as base, result would have 3 parents" +msgstr "" + +msgid "Update rebased mq patches - finalize and then import them" +msgstr "" + +#, python-format +msgid "revision %d is an mq patch (%s), finalize it.\n" +msgstr "" + +#, python-format +msgid "import mq patch %d (%s)\n" +msgstr "" + +msgid "Store the current status to allow recovery" +msgstr "" + +msgid "rebase status stored\n" +msgstr "" + +msgid "Remove the status files" +msgstr "" + +msgid "Restore a previously stored status" +msgstr "" + +msgid "rebase status resumed\n" +msgstr "" + +msgid "no rebase in progress" +msgstr "" + +msgid "Restore the repository to its original state" +msgstr "" + +msgid "warning: new changesets detected on target branch, not stripping\n" +msgstr "" + +msgid "rebase aborted\n" +msgstr "" + +msgid "Define which revisions are going to be rebased and where" +msgstr "" + +msgid "cannot rebase onto an applied mq patch" +msgstr "" + +msgid "cannot rebase an ancestor" +msgstr "" + +msgid "cannot rebase a descendant" +msgstr "" + +msgid "already working on current\n" +msgstr "" + +msgid "already working on the current branch\n" +msgstr "" + +#, python-format +msgid "rebase onto %d starting from %d\n" +msgstr "" + +msgid "unable to collapse, there is more than one external parent" +msgstr "" + +msgid "Call rebase after pull if the latter has been invoked with --rebase" +msgstr "" + +msgid "--update and --rebase are not compatible, ignoring the update flag\n" +msgstr "" + +msgid "Replace pull with a decorator to provide --rebase option" +msgstr "" + +msgid "rebase working directory to branch head" +msgstr "" + +msgid "keep original revisions" +msgstr "" + +msgid "keep original branches" +msgstr "" + +msgid "rebase from a given revision" +msgstr "" + +msgid "rebase from the base of a given revision" +msgstr "" + +msgid "rebase onto a given revision" +msgstr "" + +msgid "collapse the rebased revisions" +msgstr "" + +msgid "continue an interrupted rebase" +msgstr "" + +msgid "abort an interrupted rebase" +msgstr "" + +msgid "" +"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" +msgstr "" + +msgid "interactive change selection during commit or qrefresh" +msgstr "" + +msgid "" +"like patch.iterhunks, but yield different events\n" +"\n" +" - ('file', [header_lines + fromfile + tofile])\n" +" - ('context', [context_lines])\n" +" - ('hunk', [hunk_lines])\n" +" - ('range', (-start,len, +start,len, diffp))\n" +" " +msgstr "" + +msgid "scan lr while predicate holds" +msgstr "" + +msgid "" +"patch header\n" +"\n" +" XXX shoudn't we move this to mercurial/patch.py ?\n" +" " +msgstr "" + +msgid "this modifies a binary file (all or nothing)\n" +msgstr "" + +msgid "this is a binary file\n" +msgstr "" + +#, python-format +msgid "%d hunks, %d lines changed\n" +msgstr "" + +msgid "hunk -> (n+,n-)" +msgstr "" + +msgid "" +"patch hunk\n" +"\n" +" XXX shouldn't we merge this with patch.hunk ?\n" +" " +msgstr "" + +msgid "patch -> [] of hunks " +msgstr "" + +msgid "patch parsing state machine" +msgstr "" + +msgid "Interactively filter patch chunks into applied-only chunks" +msgstr "" + +msgid "" +"fetch next portion from chunks until a 'header' is seen\n" +" NB: header == new-file mark\n" +" " +msgstr "" + +msgid "" +"prompt query, and process base inputs\n" +"\n" +" - y/n for the rest of file\n" +" - y/n for the rest\n" +" - ? (help)\n" +" - q (quit)\n" +"\n" +" else, input is returned to the caller.\n" +" " +msgstr "" + +msgid "[Ynsfdaq?]" +msgstr "" + +msgid "y" +msgstr "" + +msgid "?" +msgstr "" + +msgid "y - record this change" +msgstr "" + +msgid "s" +msgstr "" + +msgid "f" +msgstr "" + +msgid "d" +msgstr "" + +msgid "a" +msgstr "" + +msgid "q" +msgstr "" + +msgid "user quit" +msgstr "" + +#, python-format +msgid "examine changes to %s?" +msgstr "" + +msgid " and " +msgstr "" + +#, python-format +msgid "record this change to %r?" +msgstr "" + +msgid "" +"interactively select changes to commit\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be candidates for recording.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" You will be prompted for whether to record changes to each\n" +" modified file, and for files with multiple changes, for each\n" +" change to use. For each query, the following responses are\n" +" possible:\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" +msgstr "" + +msgid "" +"interactively record a new patch\n" +"\n" +" see 'hg help qnew' & 'hg help record' for more information and usage\n" +" " +msgstr "" + +msgid "'mq' extension not loaded" +msgstr "" + +msgid "running non-interactively, use commit instead" +msgstr "" + +msgid "" +"This is generic record driver.\n" +"\n" +" It's job is to interactively filter local changes, and accordingly\n" +" prepare working dir into a state, where the job can be delegated to\n" +" non-interactive commit command such as 'commit' or 'qrefresh'.\n" +"\n" +" After the actual job is done by non-interactive command, working " +"dir\n" +" state is restored to original.\n" +"\n" +" In the end we'll record intresting changes, and everything else will " +"be\n" +" left in place, so the user can continue his work.\n" +" " +msgstr "" + +msgid "no changes to record\n" +msgstr "" + +#, python-format +msgid "backup %r as %r\n" +msgstr "" + +msgid "applying patch\n" +msgstr "" + +msgid "patch failed to apply" +msgstr "" + +#, python-format +msgid "restoring %r to %r\n" +msgstr "" + +msgid "hg record [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qrecord [OPTION]... PATCH [FILE]..." +msgstr "" + +msgid "" +"patch transplanting tool\n" +"\n" +"This extension allows you to transplant patches from another branch.\n" +"\n" +"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" +"from a changeset hash to its hash in the source repository.\n" +msgstr "" + +msgid "" +"returns True if a node is already an ancestor of parent\n" +" or has already been transplanted" +msgstr "" + +msgid "apply the revisions in revmap one by one in revision order" +msgstr "" + +#, python-format +msgid "skipping already applied revision %s\n" +msgstr "" + +#, python-format +msgid "skipping merge changeset %s:%s\n" +msgstr "" + +#, python-format +msgid "%s merged at %s\n" +msgstr "" + +#, python-format +msgid "%s transplanted to %s\n" +msgstr "" + +msgid "arbitrarily rewrite changeset before applying it" +msgstr "" + +#, python-format +msgid "filtering %s\n" +msgstr "" + +msgid "filter failed" +msgstr "" + +msgid "apply the patch in patchfile to the repository as a transplant" +msgstr "" + +msgid "can only omit patchfile if merging" +msgstr "" + +#, python-format +msgid "%s: empty changeset" +msgstr "%s: tom ændring" + +msgid "Fix up the merge and run hg transplant --continue" +msgstr "" + +msgid "recover last transaction and apply remaining changesets" +msgstr "" + +#, python-format +msgid "%s transplanted as %s\n" +msgstr "" + +msgid "commit working directory using journal metadata" +msgstr "" + +msgid "transplant log file is corrupt" +msgstr "" + +#, python-format +msgid "working dir not at transplant parent %s" +msgstr "" + +msgid "commit failed" +msgstr "" + +msgid "journal changelog metadata for later recover" +msgstr "" + +msgid "remove changelog journal" +msgstr "" + +msgid "interactively transplant changesets" +msgstr "transplanter ændringer interaktivt" + +msgid "apply changeset? [ynmpcq?]:" +msgstr "" + +msgid "" +"transplant changesets from another branch\n" +"\n" +" Selected changesets will be applied on top of the current working\n" +" directory with the log of the original changeset. If --log is\n" +" specified, log messages will have a comment appended of the form:\n" +"\n" +" (transplanted from CHANGESETHASH)\n" +"\n" +" You can rewrite the changelog message with the --filter option.\n" +" Its argument will be invoked with the current changelog message\n" +" as $1 and the patch as $2.\n" +"\n" +" If --source is specified, selects changesets from the named\n" +" repository. If --branch is specified, selects changesets from the\n" +" branch holding the named revision, up to that revision. If --all\n" +" is specified, all changesets on the branch will be transplanted,\n" +" otherwise you will be prompted to select the changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected branch\n" +" (up to the named revision) onto your current working directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as\n" +" merge changesets. You will not be prompted to transplant any\n" +" ancestors of a merged transplant, and you can merge descendants\n" +" of them normally instead of transplanting them.\n" +"\n" +" If no merges or revisions are provided, hg transplant will start\n" +" an interactive changeset browser.\n" +"\n" +" If a changeset application fails, you can fix the merge by hand and\n" +" then resume where you left off by calling hg transplant --continue.\n" +" " +msgstr "" + +msgid "--continue is incompatible with branch, all or merge" +msgstr "" + +msgid "no source URL, branch tag or revision list provided" +msgstr "" + +msgid "--all requires a branch revision" +msgstr "" + +msgid "--all is incompatible with a revision list" +msgstr "" + +msgid "no revision checked out" +msgstr "" + +msgid "outstanding uncommitted merges" +msgstr "" + +msgid "outstanding local changes" +msgstr "" + +msgid "pull patches from REPOSITORY" +msgstr "" + +msgid "pull patches from branch BRANCH" +msgstr "" + +msgid "pull all changesets up to BRANCH" +msgstr "" + +msgid "skip over REV" +msgstr "spring over REV" + +msgid "merge at REV" +msgstr "" + +msgid "append transplant info to log message" +msgstr "" + +msgid "continue last transplant session after repair" +msgstr "" + +msgid "filter changesets through FILTER" +msgstr "" + +msgid "" +"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "" + +msgid "" +"allow to use MBCS path with problematic encoding.\n" +"\n" +"Some MBCS encodings are not good for some path operations\n" +"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" +"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" +"encoding\". This extension can be used to fix the issue with those\n" +"encodings by wrapping some functions to convert to unicode string\n" +"before path operation.\n" +"\n" +"This extension is usefull for:\n" +" * Japanese Windows users using shift_jis encoding.\n" +" * Chinese Windows users using big5 encoding.\n" +" * All users who use a repository with one of problematic encodings\n" +" on case-insensitive file system.\n" +"\n" +"This extension is not needed for:\n" +" * Any user who use only ascii chars in path.\n" +" * Any user who do not use any of problematic encodings.\n" +"\n" +"Note that there are some limitations on using this extension:\n" +" * You should use single encoding in one repository.\n" +" * You should set same encoding for the repository by locale or HGENCODING.\n" +"\n" +"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" +"\n" +" [extensions]\n" +" hgext.win32mbcs =\n" +"\n" +"Path encoding conversion are done between unicode and util._encoding\n" +"which is decided by mercurial from current locale setting or HGENCODING.\n" +"\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgstr "" + +msgid "[win32mbcs] cannot activate on this platform.\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] activated with encoding: %s\n" +msgstr "" + +#, python-format +msgid "" +"WARNING: %s already has %s line endings\n" +"and does not need EOL conversion by the win32text plugin.\n" +"Before your next commit, please reconsider your encode/decode settings in \n" +"Mercurial.ini or %s.\n" +msgstr "" + +#, python-format +msgid "Attempt to commit or push text file(s) using %s line endings\n" +msgstr "" + +#, python-format +msgid "in %s: %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"To prevent this mistake in your local repository,\n" +"add to Mercurial.ini or .hg/hgrc:\n" +"\n" +"[hooks]\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s\n" +"\n" +"and also consider adding:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = %sencode:\n" +"[decode]\n" +"** = %sdecode:\n" +msgstr "" + +msgid "" +"zeroconf support for mercurial repositories\n" +"\n" +"Zeroconf enabled repositories will be announced in a network without the " +"need\n" +"to configure a server or a service. They can be discovered without knowing\n" +"their actual IP address.\n" +"\n" +"To use the zeroconf extension add the following entry to your hgrc file:\n" +"\n" +"[extensions]\n" +"hgext.zeroconf =\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\" in " +"your\n" +"repository.\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\".\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" +msgstr "" + +msgid "archive prefix contains illegal components" +msgstr "arkivpræfix indeholder ugyldige komponenter" + +msgid "cannot give prefix when archiving to files" +msgstr "kan ikke give præfix ved arkivering til filer" + +#, python-format +msgid "unknown archive type '%s'" +msgstr "ukendt arkivtype '%s'" + +msgid "invalid changegroup" +msgstr "" + +msgid "unknown parent" +msgstr "ukendt forældre" + +#, python-format +msgid "integrity check failed on %s:%d" +msgstr "integritetstjek fejlede på %s:%d" + +#, python-format +msgid "%s: not a Mercurial bundle file" +msgstr "%s er ikke en Mercurial bundle fil" + +#, python-format +msgid "%s: unknown bundle version" +msgstr "%s: ukendt bundle version" + +#, python-format +msgid "%s: unknown bundle compression type" +msgstr "%s: ukendt bundle kompressionstype" + +msgid "cannot create new bundle repository" +msgstr "" + +#, python-format +msgid "premature EOF reading chunk (got %d bytes, expected %d)" +msgstr "for tidlig EOF ved læsning af chunk (fik %d bytes, forventede %d)" + +#, python-format +msgid "username %s contains a newline" +msgstr "brugernavn %s indeholder et linieskift" + +msgid "options --message and --logfile are mutually exclusive" +msgstr "" + +#, python-format +msgid "can't read commit message '%s': %s" +msgstr "Kan ikke lase commit besked '%s': %s" + +msgid "limit must be a positive integer" +msgstr "" + +msgid "limit must be positive" +msgstr "" + +msgid "too many revisions specified" +msgstr "der er specificeret for mange revisioner" + +#, python-format +msgid "invalid format spec '%%%s' in output file name" +msgstr "" + +#, python-format +msgid "adding %s\n" +msgstr "tilføjer %s\n" + +#, python-format +msgid "removing %s\n" +msgstr "fjerner %s\n" + +#, python-format +msgid "recording removal of %s as rename to %s (%d%% similar)\n" +msgstr "noterer fjernelse af %s som en omdøbning til %s (%d%% lighed)\n" + +#, python-format +msgid "%s: not copying - file is not managed\n" +msgstr "%s: kopierer ikke - filen er ikke versionsstyret\n" + +#, python-format +msgid "%s: not copying - file has been marked for remove\n" +msgstr "%s: kopierer ikke - filen er markeret til sletning\n" + +#, python-format +msgid "%s: not overwriting - %s collides with %s\n" +msgstr "%s: overskriver ikke - %s kolliderer med %s\n" + +#, python-format +msgid "%s: not overwriting - file exists\n" +msgstr "%s: overskriver ikke - filen eksisterer\n" + +#, python-format +msgid "%s: deleted in working copy\n" +msgstr "%s: slettet i arbejdskopien\n" + +#, python-format +msgid "%s: cannot copy - %s\n" +msgstr "%s: kan ikke kopiere - %s\n" + +#, python-format +msgid "%s %s to %s\n" +msgstr "%s: %s til %s\n" + +#, python-format +msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" +msgstr "" +"%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for %" +"s.\n" + +msgid "no source or destination specified" +msgstr "ingen kilde eller destination angivet" + +msgid "no destination specified" +msgstr "ingen destination angivet" + +msgid "with multiple sources, destination must be an existing directory" +msgstr "" +"destinationen skal være en eksisterende mappe når der angivet flere kilder" + +#, python-format +msgid "destination %s is not a directory" +msgstr "destinationen %s er ikke en mappe" + +msgid "no files to copy" +msgstr "ingen filer at kopiere" + +msgid "(consider using --after)\n" +msgstr "(overvej at bruge --after)\n" + +#, python-format +msgid "changeset: %d:%s\n" +msgstr "ændring: %d:%s\n" + +#, python-format +msgid "branch: %s\n" +msgstr "gren: %s\n" + +#, python-format +msgid "tag: %s\n" +msgstr "mærkat: %s\n" + +#, python-format +msgid "parent: %d:%s\n" +msgstr "forældre: %d:%s\n" + +#, python-format +msgid "manifest: %d:%s\n" +msgstr "" + +#, python-format +msgid "user: %s\n" +msgstr "bruger: %s\n" + +#, python-format +msgid "date: %s\n" +msgstr "dato: %s\n" + +msgid "files+:" +msgstr "filer+:" + +msgid "files-:" +msgstr "filer-:" + +msgid "files:" +msgstr "" + +#, python-format +msgid "files: %s\n" +msgstr "filer: %s\n" + +#, python-format +msgid "copies: %s\n" +msgstr "kopier: %s\n" + +#, python-format +msgid "extra: %s=%s\n" +msgstr "ekstra: %s=%s\n" + +msgid "description:\n" +msgstr "beskrivelse:\n" + +#, python-format +msgid "summary: %s\n" +msgstr "uddrag: %s\n" + +#, python-format +msgid "%s: no key named '%s'" +msgstr "" + +#, python-format +msgid "%s: %s" +msgstr "" + +#, python-format +msgid "Found revision %s from %s\n" +msgstr "" + +msgid "revision matching date not found" +msgstr "" + +#, python-format +msgid "cannot follow nonexistent file: \"%s\"" +msgstr "" + +#, python-format +msgid "%s:%s copy source revision cannot be found!\n" +msgstr "" + +msgid "can only follow copies/renames for explicit file names" +msgstr "" + +#, python-format +msgid "file %s not found!" +msgstr "filen %s blev ikke fundet!" + +#, python-format +msgid "no match under directory %s!" +msgstr "" + +#, python-format +msgid "can't commit %s: unsupported file type!" +msgstr "" + +#, python-format +msgid "file %s not tracked!" +msgstr "" + +msgid "" +"add the specified files on the next commit\n" +"\n" +" Schedule files to be version controlled and added to the repository.\n" +"\n" +" The files will be added to the repository at the next commit. To\n" +" undo an add before that, see hg revert.\n" +"\n" +" If no names are given, add all files in the repository.\n" +" " +msgstr "" +"tilføj de angivne filer ved næste commit\n" +"\n" +" Opskriv filer til at blive versionsstyret og tilføjet til arkivet.\n" +"\n" +" Filerne vil bliver tilføjet til arkivet ved næste commit. For at\n" +" omgøre en tilføjelse før det, se hg revert.\n" +"\n" +" Hvis der ikke er angivet nogen navne tilføjes alle filer i\n" +" arkivet.\n" +" " + +msgid "" +"add all new files, delete all missing files\n" +"\n" +" Add all new files and remove all missing files from the repository.\n" +"\n" +" New files are ignored if they match any of the patterns in .hgignore. " +"As\n" +" with add, these changes take effect at the next commit.\n" +"\n" +" Use the -s option to detect renamed files. With a parameter > 0,\n" +" this compares every removed file with every added file and records\n" +" those similar enough as renames. This option takes a percentage\n" +" between 0 (disabled) and 100 (files must be identical) as its\n" +" parameter. Detecting renamed files this way can be expensive.\n" +" " +msgstr "" + +msgid "similarity must be a number" +msgstr "" + +msgid "similarity must be between 0 and 100" +msgstr "" + +msgid "" +"show changeset information per file line\n" +"\n" +" List changes in files, showing the revision id responsible for each " +"line\n" +"\n" +" This command is useful to discover who did a change or when a change " +"took\n" +" place.\n" +"\n" +" Without the -a option, annotate will avoid processing files it\n" +" detects as binary. With -a, annotate will generate an annotation\n" +" anyway, probably with undesirable results.\n" +" " +msgstr "" + +msgid "at least one file name or pattern required" +msgstr "" + +msgid "at least one of -n/-c is required for -l" +msgstr "" + +#, python-format +msgid "%s: binary file\n" +msgstr "" + +msgid "" +"create unversioned archive of a repository revision\n" +"\n" +" By default, the revision used is the parent of the working\n" +" directory; use \"-r\" to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use \"-t\". Valid\n" +" types are:\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" +"\n" +" The exact name of the destination archive or directory is given\n" +" using a format string; see \"hg help export\" for details.\n" +"\n" +" Each member added to an archive file has a directory prefix\n" +" prepended. Use \"-p\" to specify a format string for the prefix.\n" +" The default is the basename of the archive, with suffixes removed.\n" +" " +msgstr "" + +msgid "no working directory: please specify a revision" +msgstr "" + +msgid "repository root cannot be destination" +msgstr "" + +msgid "cannot archive plain files to stdout" +msgstr "" + +msgid "" +"reverse effect of earlier changeset\n" +"\n" +" Commit the backed out changes as a new changeset. The new\n" +" changeset is a child of the backed out changeset.\n" +"\n" +" If you back out a changeset other than the tip, a new head is\n" +" created. This head will be the new tip and you should merge this\n" +" backout changeset with another head (current one by default).\n" +"\n" +" The --merge option remembers the parent of the working directory\n" +" before starting the backout, then merges the new head with that\n" +" changeset afterwards. This saves you from doing the merge by\n" +" hand. The result of this merge is not committed, as for a normal\n" +" merge.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "please specify just one revision" +msgstr "angiv venligst kun en revision" + +msgid "please specify a revision to backout" +msgstr "" + +msgid "cannot back out change on a different branch" +msgstr "kan ikke bakke en ændring på en anden gren ud" + +msgid "cannot back out a change with no parents" +msgstr "kan ikke bakke en ændring ud uden forældre" + +msgid "cannot back out a merge changeset without --parent" +msgstr "" + +#, python-format +msgid "%s is not a parent of %s" +msgstr "%s er ikke forældre til %s" + +msgid "cannot use --parent on non-merge changeset" +msgstr "" + +#, python-format +msgid "Backed out changeset %s" +msgstr "" + +#, python-format +msgid "changeset %s backs out changeset %s\n" +msgstr "ændring %s bakker ændring %s ud\n" + +#, python-format +msgid "merging with changeset %s\n" +msgstr "" + +msgid "the backout changeset is a new head - do not forget to merge\n" +msgstr "" + +msgid "(use \"backout --merge\" if you want to auto-merge)\n" +msgstr "" + +msgid "" +"subdivision search of changesets\n" +"\n" +" This command helps to find changesets which introduce problems.\n" +" To use, mark the earliest changeset you know exhibits the problem\n" +" as bad, then mark the latest changeset which is free from the\n" +" problem as good. Bisect will update your working directory to a\n" +" revision for testing (unless the --noupdate option is specified).\n" +" Once you have performed tests, mark the working directory as bad\n" +" or good and bisect will either update to another candidate changeset\n" +" or announce that it has found the bad revision.\n" +"\n" +" As a shortcut, you can also use the revision argument to mark a\n" +" revision as good or bad without checking it out first.\n" +"\n" +" If you supply a command it will be used for automatic bisection. Its " +"exit\n" +" status will be used as flag to mark revision as bad or good. In case " +"exit\n" +" status is 0 the revision is marked as good, 125 - skipped, 127 (command " +"not\n" +" found) - bisection will be aborted and any other status bigger than 0 " +"will\n" +" mark revision as bad.\n" +" " +msgstr "" + +#, python-format +msgid "The first %s revision is:\n" +msgstr "Den første %s revision er:\n" + +#, python-format +msgid "Due to skipped revisions, the first %s revision could be any of:\n" +msgstr "" + +msgid "cannot bisect (no known good revisions)" +msgstr "" + +msgid "cannot bisect (no known bad revisions)" +msgstr "" + +msgid "(use of 'hg bisect <cmd>' is deprecated)\n" +msgstr "" + +msgid "incompatible arguments" +msgstr "" + +#, python-format +msgid "failed to execute %s" +msgstr "" + +#, python-format +msgid "%s killed" +msgstr "%s dræbt" + +#, python-format +msgid "Changeset %s: %s\n" +msgstr "Ændring: %s: %s\n" + +#, python-format +msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgstr "" + +msgid "" +"set or show the current branch name\n" +"\n" +" With no argument, show the current branch name. With one argument,\n" +" set the working directory branch name (the branch does not exist in\n" +" the repository until the next commit).\n" +"\n" +" Unless --force is specified, branch will not let you set a\n" +" branch name that shadows an existing branch.\n" +"\n" +" Use --clean to reset the working directory branch to that of the\n" +" parent of the working directory, negating a previous branch change.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" + +#, python-format +msgid "reset working directory to branch %s\n" +msgstr "" + +msgid "a branch of the same name already exists (use --force to override)" +msgstr "" + +#, python-format +msgid "marked working directory as branch %s\n" +msgstr "" + +msgid "" +"list repository named branches\n" +"\n" +" List the repository's named branches, indicating which ones are\n" +" inactive. If active is specified, only show active branches.\n" +"\n" +" A branch is considered active if it contains repository heads.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" + +msgid "" +"create a changegroup file\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" found in the other repository.\n" +"\n" +" If no destination repository is specified the destination is\n" +" assumed to have all the nodes specified by one or more --base\n" +" parameters. To create a bundle containing all changesets, use\n" +" --all (or --base null). To change the compression method applied,\n" +" use the -t option (by default, bundles are compressed using bz2).\n" +"\n" +" The bundle file can then be transferred using conventional means and\n" +" applied to another repository with the unbundle or pull command.\n" +" This is useful when direct push and pull are not available or when\n" +" exporting an entire repository is undesirable.\n" +"\n" +" Applying bundles preserves all changeset contents including\n" +" permissions, copy/rename information, and revision history.\n" +" " +msgstr "" + +msgid "--base is incompatible with specifiying a destination" +msgstr "" + +msgid "unknown bundle type specified with --type" +msgstr "" + +msgid "" +"output the current or given revision of files\n" +"\n" +" Print the specified files as they were at the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are the same as\n" +" for the export command, with the following additions:\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repo root\n" +" %p root-relative path name of file being printed\n" +" " +msgstr "" + +msgid "" +"make a copy of an existing repository\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" The location of the source is added to the new repository's\n" +" .hg/hgrc file, as the default to be used for future pulls.\n" +"\n" +" For efficiency, hardlinks are used for cloning whenever the source\n" +" and destination are on the same filesystem (note this applies only\n" +" to the repository data, not to the checked out files). Some\n" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\n" +" using full hardlinks with\n" +"\n" +" $ cp -al REPO REPOCLONE\n" +"\n" +" This is the fastest way to clone, but it is not always safe. The\n" +" operation is not atomic (making sure REPO is not modified during\n" +" the operation is up to you) and you have to make sure your editor\n" +" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" If you use the -r option to clone up to a specific revision, no\n" +" subsequent revisions will be present in the cloned repository.\n" +" This option implies --pull, even on local repositories.\n" +"\n" +" If the -U option is used, the new clone will contain only a repository\n" +" (.hg) and no working copy (the working copy parent is the null " +"revision).\n" +"\n" +" See 'hg help urls' for valid source format details.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination, but no\n" +" .hg/hgrc and working directory will be created on the remote side.\n" +" Look at the help text for urls for important details about ssh:// URLs.\n" +" " +msgstr "" + +msgid "" +"commit the specified files or all outstanding changes\n" +"\n" +" Commit changes to the given files into the repository.\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be committed.\n" +"\n" +" If you are committing the result of a merge, do not provide any\n" +" file names or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is started to\n" +" enter a message.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "created new head\n" +msgstr "lavede et nyt hoved\n" + +#, python-format +msgid "committed changeset %d:%s\n" +msgstr "" + +msgid "" +"mark files as copied for the next commit\n" +"\n" +" Mark dest as having copies of source files. If dest is a\n" +" directory, copies are put in that directory. If dest is a file,\n" +" there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a copy\n" +" before that, see hg revert.\n" +" " +msgstr "" + +msgid "find the ancestor revision of two revisions in a given index" +msgstr "" + +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "Der er ikke noget Mercurial arkiv her (fandt ikke .hg)" + +msgid "either two or three arguments required" +msgstr "kræver enten to eller tre argumenter" + +msgid "returns the completion list associated with the given command" +msgstr "" + +msgid "rebuild the dirstate as it would look like for the given revision" +msgstr "" + +msgid "validate the correctness of the current dirstate" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but also in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in either manifest\n" +msgstr "" + +#, python-format +msgid "%s in manifest1, but listed as state %s" +msgstr "" + +msgid ".hg/dirstate inconsistent with current parent's manifest" +msgstr "" + +msgid "" +"show combined config settings from all hgrc files\n" +"\n" +" With no args, print names and values of all config items.\n" +"\n" +" With one arg of the form section.name, print just the value of\n" +" that config item.\n" +"\n" +" With multiple args, print names and values of all config items\n" +" with matching section names." +msgstr "" + +msgid "only one config item permitted" +msgstr "" + +msgid "" +"manually set the parents of the current working directory\n" +"\n" +" This is useful for writing repository conversion tools, but should\n" +" be used with care.\n" +" " +msgstr "" + +msgid "show the contents of the current dirstate" +msgstr "" + +#, python-format +msgid "copy: %s -> %s\n" +msgstr "kopi: %s -> %s\n" + +msgid "dump the contents of a data file revision" +msgstr "" + +#, python-format +msgid "invalid revision identifier %s" +msgstr "ugyldig revisionsidentification %s" + +msgid "parse and display a date" +msgstr "" + +msgid "dump the contents of an index file" +msgstr "" + +msgid "dump an index DAG as a .dot file" +msgstr "" + +msgid "test Mercurial installation" +msgstr "" + +#, python-format +msgid "Checking encoding (%s)...\n" +msgstr "" + +msgid " (check that your locale is properly set)\n" +msgstr "" + +msgid "Checking extensions...\n" +msgstr "" + +msgid " One or more extensions could not be found" +msgstr "" + +msgid " (check that you compiled the extensions)\n" +msgstr "" + +msgid "Checking templates...\n" +msgstr "" + +msgid " (templates seem to have been installed incorrectly)\n" +msgstr "" + +msgid "Checking patch...\n" +msgstr "" + +msgid " patch call failed:\n" +msgstr "" + +msgid " unexpected patch output!\n" +msgstr "" + +msgid " patch test failed!\n" +msgstr "" + +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://www.selenic." +"com/mercurial/bts\n" +msgstr "" + +msgid "Checking commit editor...\n" +msgstr "" + +msgid " No commit editor set and can't find vi in PATH\n" +msgstr "" + +msgid " (specify a commit editor in your .hgrc file)\n" +msgstr "" + +#, python-format +msgid " Can't find editor '%s' in PATH\n" +msgstr "" + +msgid "Checking username...\n" +msgstr "" + +msgid " (specify a username in your .hgrc file)\n" +msgstr "" + +msgid "No problems detected\n" +msgstr "Fandt ingen problemer\n" + +#, python-format +msgid "%s problems detected, please check your install!\n" +msgstr "" + +msgid "dump rename information" +msgstr "" + +#, python-format +msgid "%s renamed from %s:%s\n" +msgstr "%s omdøbt fra %s:%s\n" + +#, python-format +msgid "%s not renamed\n" +msgstr "%s ikke omdøbt\n" + +msgid "show how files match on given patterns" +msgstr "" + +msgid "" +"diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files.\n" +"\n" +" Differences between files are shown using the unified diff format.\n" +"\n" +" NOTE: diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first parent\n" +" changeset if no revisions are specified.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent.\n" +"\n" +" Without the -a option, diff will avoid generating diffs of files\n" +" it detects as binary. With -a, diff will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +" " +msgstr "" + +msgid "" +"dump the header and diffs for one or more changesets\n" +"\n" +" Print the changeset header and diffs for one or more revisions.\n" +"\n" +" The information shown in the changeset header is: author,\n" +" changeset hash, parent(s) and commit comment.\n" +"\n" +" NOTE: export may generate unexpected diff output for merge changesets,\n" +" as it will compare the merge changeset against its first parent only.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are as follows:\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" +"\n" +" Without the -a option, export will avoid generating diffs of files\n" +" it detects as binary. With -a, export will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the second\n" +" parent. It can be useful to review a merge.\n" +" " +msgstr "" + +msgid "export requires at least one changeset" +msgstr "" + +msgid "exporting patches:\n" +msgstr "" + +msgid "exporting patch:\n" +msgstr "" + +msgid "" +"search for a pattern in specified files and revisions\n" +"\n" +" Search revisions of files for a regular expression.\n" +"\n" +" This command behaves differently than Unix grep. It only accepts\n" +" Python/Perl regexps. It searches repository history, not the\n" +" working directory. It always prints the revision number in which\n" +" a match appears.\n" +"\n" +" By default, grep only prints output for the first revision of a\n" +" file in which it finds a match. To get it to print every revision\n" +" that contains a change in match status (\"-\" for a match that\n" +" becomes a non-match, or \"+\" for a non-match that becomes a match),\n" +" use the --all flag.\n" +" " +msgstr "" + +#, python-format +msgid "grep: invalid match pattern: %s\n" +msgstr "" + +msgid "" +"show current repository heads or show branch heads\n" +"\n" +" With no arguments, show all repository head changesets.\n" +"\n" +" If branch or revisions names are given this will show the heads of\n" +" the specified branches or the branches those revisions are tagged\n" +" with.\n" +"\n" +" Repository \"heads\" are changesets that don't have child\n" +" changesets. They are where development generally takes place and\n" +" are the usual targets for update and merge operations.\n" +"\n" +" Branch heads are changesets that have a given branch tag, but have\n" +" no child changesets with that tag. They are usually where\n" +" development on the given branch takes place.\n" +" " +msgstr "" + +#, python-format +msgid "no changes on branch %s containing %s are reachable from %s\n" +msgstr "" + +#, python-format +msgid "no changes on branch %s are reachable from %s\n" +msgstr "" + +msgid "" +"show help for a given topic or a help overview\n" +"\n" +" With no arguments, print a list of commands and short help.\n" +"\n" +" Given a topic, extension, or command name, print help for that topic." +msgstr "" + +msgid "global options:" +msgstr "" + +msgid "use \"hg help\" for the full list of commands" +msgstr "brug \"hg help\" for den fulde liste af kommandoer" + +msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" +msgstr "" +"brug \"hg help\" for den fulde liste af kommandoer eller \"hg -v\" for " +"detaljer" + +#, python-format +msgid "use \"hg -v help%s\" to show aliases and global options" +msgstr "brug \"hg -v help%s\" for at vise aliaser og globale valgmuligheder" + +#, python-format +msgid "use \"hg -v help %s\" to show global options" +msgstr "brug \"hg -v help %s\" for at vise globale valgmuligheder" + +msgid "" +"list of commands:\n" +"\n" +msgstr "" +"liste af kommandoer:\n" +"\n" + +#, python-format +msgid "" +"\n" +"aliases: %s\n" +msgstr "" +"\n" +"aliaser %s:\n" + +msgid "(no help text available)" +msgstr "(ingen hjælpetekst tilgængelig)" + +msgid "options:\n" +msgstr "valgmuligheder:\n" + +msgid "no commands defined\n" +msgstr "ingen kommandoer defineret\n" + +msgid "" +"\n" +"enabled extensions:\n" +"\n" +msgstr "" +"\n" +"aktiverede udvidelser:\n" +"\n" + +#, python-format +msgid " %s %s\n" +msgstr "" + +msgid "no help text available" +msgstr "ingen hjælpetekst tilgængelig" + +#, python-format +msgid "%s extension - %s\n" +msgstr "" + +msgid "Mercurial Distributed SCM\n" +msgstr "Mercurial Distribueret SCM\n" + +msgid "" +"basic commands:\n" +"\n" +msgstr "" +"basale kommandoer:\n" +"\n" + +msgid "" +"\n" +"additional help topics:\n" +"\n" +msgstr "" +"\n" +"yderligere hjælpeemner:\n" +"\n" + +msgid "" +"identify the working copy or specified revision\n" +"\n" +" With no revision, print a summary of the current state of the repo.\n" +"\n" +" With a path, do a lookup in another repository.\n" +"\n" +" This summary identifies the repository state using one or two parent\n" +" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" +" in the working directory, a list of tags for this revision and a branch\n" +" name for non-default branches.\n" +" " +msgstr "" + +msgid "" +"import an ordered set of patches\n" +"\n" +" Import a list of patches and commit them individually.\n" +"\n" +" If there are outstanding changes in the working directory, import\n" +" will abort unless given the -f flag.\n" +"\n" +" You can import a patch straight from a mail message. Even patches\n" +" as attachments work (body part must be type text/plain or\n" +" text/x-patch to be used). From and Subject headers of email\n" +" message are used as default committer and commit message. All\n" +" text/plain body parts before first diff are added to commit\n" +" message.\n" +"\n" +" If the imported patch was generated by hg export, user and description\n" +" from patch override values from message headers and body. Values\n" +" given on command line with -m and -u override these.\n" +"\n" +" If --exact is specified, import will set the working directory\n" +" to the parent of each patch before applying it, and will abort\n" +" if the resulting changeset has a different ID than the one\n" +" recorded in the patch. This may happen due to character set\n" +" problems or other deficiencies in the text patch format.\n" +"\n" +" With --similarity, hg will attempt to discover renames and copies\n" +" in the patch in the same way as 'addremove'.\n" +"\n" +" To read a patch from standard input, use patch name \"-\".\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "applying patch from stdin\n" +msgstr "" + +msgid "no diffs found" +msgstr "" + +#, python-format +msgid "" +"message:\n" +"%s\n" +msgstr "" +"meddelse:\n" +"%s\n" + +msgid "not a mercurial patch" +msgstr "" + +msgid "patch is damaged or loses information" +msgstr "" + +msgid "" +"show new changesets found in source\n" +"\n" +" Show new changesets found in the specified path/URL or the default\n" +" pull location. These are the changesets that would be pulled if a pull\n" +" was requested.\n" +"\n" +" For remote repository, using --bundle avoids downloading the changesets\n" +" twice if the incoming is followed by a pull.\n" +"\n" +" See pull for valid source format details.\n" +" " +msgstr "" + +msgid "" +"create a new repository in the given directory\n" +"\n" +" Initialize a new repository in the given directory. If the given\n" +" directory does not exist, it is created.\n" +"\n" +" If no directory is given, the current directory is used.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +msgid "" +"locate files matching specific patterns\n" +"\n" +" Print all files under Mercurial control whose names match the\n" +" given patterns.\n" +"\n" +" This command searches the entire repository by default. To search\n" +" just the current directory and its subdirectories, use\n" +" \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints all file\n" +" names.\n" +"\n" +" If you want to feed the output of this command into the \"xargs\"\n" +" command, use the \"-0\" option to both this command and \"xargs\".\n" +" This will avoid the problem of \"xargs\" treating single filenames\n" +" that contain white space as multiple filenames.\n" +" " +msgstr "" + +msgid "" +"show revision history of entire repository or files\n" +"\n" +" Print the revision history of the specified files or the entire\n" +" project.\n" +"\n" +" File history is shown without following rename or copy history of\n" +" files. Use -f/--follow with a file name to follow history across\n" +" renames and copies. --follow without a file name will only show\n" +" ancestors or descendants of the starting revision. --follow-first\n" +" only follows the first parent of merge revisions.\n" +"\n" +" If no revision range is specified, the default is tip:0 unless\n" +" --follow is set, in which case the working directory parent is\n" +" used as the starting revision.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" By default this command outputs: changeset id and hash, tags,\n" +" non-trivial parents, user, date and time, and a summary for each\n" +" commit. When the -v/--verbose switch is used, the list of changed\n" +" files and full commit message is shown.\n" +"\n" +" NOTE: log -p may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only. Also, the files: list will only reflect files\n" +" that are different from BOTH parents.\n" +"\n" +" " +msgstr "" + +msgid "" +"looks up all renames for a file (up to endrev) the first\n" +" time the file is given. It indexes on the changerev and only\n" +" parses the manifest if linkrev != changerev.\n" +" Returns rename info for fn at changerev rev." +msgstr "" + +msgid "" +"output the current or given revision of the project manifest\n" +"\n" +" Print a list of version controlled files for the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" The manifest is the list of files being version controlled. If no " +"revision\n" +" is given then the first parent of the working directory is used.\n" +"\n" +" With -v flag, print file permissions, symlink and executable bits. With\n" +" --debug flag, print file revision hashes.\n" +" " +msgstr "" + +msgid "" +"merge working directory with another revision\n" +"\n" +" Merge the contents of the current working directory and the\n" +" requested revision. Files that changed between either parent are\n" +" marked as changed for the next commit and a commit must be\n" +" performed before any further updates are allowed.\n" +"\n" +" If no revision is specified, the working directory's parent is a\n" +" head revision, and the current branch contains exactly one other head,\n" +" the other head is merged with by default. Otherwise, an explicit\n" +" revision to merge with must be provided.\n" +" " +msgstr "" + +#, python-format +msgid "branch '%s' has %d heads - please merge with an explicit rev" +msgstr "" + +#, python-format +msgid "branch '%s' has one head - please merge with an explicit rev" +msgstr "" + +msgid "there is nothing to merge" +msgstr "" + +#, python-format +msgid "%s - use \"hg update\" instead" +msgstr "%s - brug \"hg update\" istedet" + +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" +msgstr "" + +msgid "" +"show changesets not found in destination\n" +"\n" +" Show changesets not found in the specified destination repository or\n" +" the default push location. These are the changesets that would be " +"pushed\n" +" if a push was requested.\n" +"\n" +" See pull for valid destination format details.\n" +" " +msgstr "" + +msgid "" +"show the parents of the working dir or revision\n" +"\n" +" Print the working directory's parent revisions. If a\n" +" revision is given via --rev, the parent of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (before the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" + +msgid "can only specify an explicit file name" +msgstr "" + +#, python-format +msgid "'%s' not found in manifest!" +msgstr "" + +msgid "" +"show aliases for remote repositories\n" +"\n" +" Show definition of symbolic path name NAME. If no name is given, show\n" +" definition of available names.\n" +"\n" +" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" +"\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +msgid "not found!\n" +msgstr "ikke fundet!\n" + +msgid "not updating, since new heads added\n" +msgstr "opdaterer ikke idet nye hoveder er tilføjet\n" + +msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" +msgstr "(kør 'hg heads' for at se hoveder, 'hg merge' for at sammenføje)\n" + +msgid "(run 'hg update' to get a working copy)\n" +msgstr "(kør 'hg update' for at få en arbejdskopi)\n" + +msgid "" +"pull changes from the specified source\n" +"\n" +" Pull changes from a remote repository to a local one.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository. By default, this\n" +" does not update the copy of the project in the working directory.\n" +"\n" +" If SOURCE is omitted, the 'default' path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" + +msgid "" +"push changes to the specified destination\n" +"\n" +" Push changes from the local repository to the given destination.\n" +"\n" +" This is the symmetrical operation for pull. It helps to move\n" +" changes from the current repository to a different one. If the\n" +" destination is local this is identical to a pull in that directory\n" +" from the current one.\n" +"\n" +" By default, push will refuse to run if it detects the result would\n" +" increase the number of remote heads. This generally indicates the\n" +" the client has forgotten to pull and merge before pushing.\n" +"\n" +" If -r is used, the named changeset and all its ancestors will be pushed\n" +" to the remote repository.\n" +"\n" +" Look at the help text for urls for important details about ssh:// URLs.\n" +" If DESTINATION is omitted, a default path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +#, python-format +msgid "pushing to %s\n" +msgstr "skubber til %s\n" + +msgid "" +"raw commit interface (DEPRECATED)\n" +"\n" +" (DEPRECATED)\n" +" Lowlevel commit, for use in helper scripts.\n" +"\n" +" This command is not intended to be used by normal users, as it is\n" +" primarily useful for importing from other SCMs.\n" +"\n" +" This command is now deprecated and will be removed in a future\n" +" release, please use debugsetparents and commit instead.\n" +" " +msgstr "" + +msgid "(the rawcommit command is deprecated)\n" +msgstr "" + +msgid "" +"roll back an interrupted transaction\n" +"\n" +" Recover from an interrupted commit or pull.\n" +"\n" +" This command tries to fix the repository status after an interrupted\n" +" operation. It should only be necessary when Mercurial suggests it.\n" +" " +msgstr "" + +msgid "" +"remove the specified files on the next commit\n" +"\n" +" Schedule the indicated files for removal from the repository.\n" +"\n" +" This only removes files from the current branch, not from the entire\n" +" project history. -A can be used to remove only files that have already\n" +" been deleted, -f can be used to force deletion, and -Af can be used\n" +" to remove files from the next revision without deleting them.\n" +"\n" +" The following table details the behavior of remove for different file\n" +" states (columns) and option combinations (rows). The file states are\n" +" Added, Clean, Modified and Missing (as reported by hg status). The\n" +" actions are Warn, Remove (from branch) and Delete (from disk).\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" +"\n" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file %s (use -f to force removal)\n" +msgstr "fjerner ikke %s: filen %s (brug -f for at forcere fjernelsen)\n" + +msgid "still exists" +msgstr "eksisterer stadig" + +msgid "is modified" +msgstr "er modificeret" + +msgid "has been marked for add" +msgstr "er markeret som tilføjet" + +msgid "" +"rename files; equivalent of copy + remove\n" +"\n" +" Mark dest as copies of sources; mark sources for deletion. If\n" +" dest is a directory, copies are put in that directory. If dest is\n" +" a file, there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a rename\n" +" before that, see hg revert.\n" +" " +msgstr "" + +msgid "" +"retry file merges from a merge or update\n" +"\n" +" This command will cleanly retry unresolved file merges using file\n" +" revisions preserved from the last update or merge. To attempt to\n" +" resolve all unresolved files, use the -a switch.\n" +"\n" +" This command will also allow listing resolved files and manually\n" +" marking and unmarking files as resolved.\n" +"\n" +" The codes used to show the status of files are:\n" +" U = unresolved\n" +" R = resolved\n" +" " +msgstr "" + +msgid "too many options specified" +msgstr "" + +msgid "can't specify --all and patterns" +msgstr "" + +msgid "no files or directories specified; use --all to remerge all files" +msgstr "" +"ingen filer eller mapper specificeret; brug --all for at gen-sammenføje alle " +"filerne" + +msgid "" +"restore individual files or dirs to an earlier state\n" +"\n" +" (use update -r to check out earlier revisions, revert does not\n" +" change the working dir parents)\n" +"\n" +" With no revision specified, revert the named files or directories\n" +" to the contents they had in the parent of the working directory.\n" +" This restores the contents of the affected files to an unmodified\n" +" state and unschedules adds, removes, copies, and renames. If the\n" +" working directory has two parents, you must explicitly specify the\n" +" revision to revert to.\n" +"\n" +" Using the -r option, revert the given files or directories to their\n" +" contents as of a specific revision. This can be helpful to \"roll\n" +" back\" some or all of an earlier change.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" Revert modifies the working directory. It does not commit any\n" +" changes, or change the parent of the working directory. If you\n" +" revert to a revision other than the parent of the working\n" +" directory, the reverted files will thus appear modified\n" +" afterwards.\n" +"\n" +" If a file has been deleted, it is restored. If the executable\n" +" mode of a file was changed, it is reset.\n" +"\n" +" If names are given, all files matching the names are reverted.\n" +" If no arguments are given, no files are reverted.\n" +"\n" +" Modified files are saved with a .orig suffix before reverting.\n" +" To disable these backups, use --no-backup.\n" +" " +msgstr "" + +msgid "you can't specify a revision and a date" +msgstr "du kan ikke specificeret en revision og en dato" + +msgid "no files or directories specified; use --all to revert the whole repo" +msgstr "" +"ingen filer eller mapper specificeret; brug --all for at føre hele repo'et " +"tilbage" + +#, python-format +msgid "forgetting %s\n" +msgstr "glemmer %s\n" + +#, python-format +msgid "reverting %s\n" +msgstr "fører %s tilbage\n" + +#, python-format +msgid "undeleting %s\n" +msgstr "" + +#, python-format +msgid "saving current version of %s as %s\n" +msgstr "gemmer nuværende version af %s som %s\n" + +#, python-format +msgid "file not managed: %s\n" +msgstr "" + +#, python-format +msgid "no changes needed to %s\n" +msgstr "" + +msgid "" +"roll back the last transaction\n" +"\n" +" This command should be used with care. There is only one level of\n" +" rollback, and there is no way to undo a rollback. It will also\n" +" restore the dirstate at the time of the last transaction, losing\n" +" any dirstate changes since that time.\n" +"\n" +" Transactions are used to encapsulate the effects of all commands\n" +" that create new changesets or propagate existing changesets into a\n" +" repository. For example, the following commands are transactional,\n" +" and their effects can be rolled back:\n" +"\n" +" commit\n" +" import\n" +" pull\n" +" push (with this repository as destination)\n" +" unbundle\n" +"\n" +" This command is not intended for use on public repositories. Once\n" +" changes are visible for pull by other users, rolling a transaction\n" +" back locally is ineffective (someone else may already have pulled\n" +" the changes). Furthermore, a race is possible with readers of the\n" +" repository; for example an in-progress pull from the repository\n" +" may fail if a rollback is performed.\n" +" " +msgstr "" + +msgid "" +"print the root (top) of the current working dir\n" +"\n" +" Print the root directory of the current repository.\n" +" " +msgstr "" + +msgid "" +"export the repository via HTTP\n" +"\n" +" Start a local HTTP repository browser and pull server.\n" +"\n" +" By default, the server logs accesses to stdout and errors to\n" +" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" " +msgstr "" + +#, python-format +msgid "listening at http://%s%s/%s (bound to %s:%d)\n" +msgstr "lytter på http://%s%s/%s (bundet til %s:%d)\n" + +msgid "" +"show changed files in the working directory\n" +"\n" +" Show status of files in the repository. If names are given, only\n" +" files that match are shown. Files that are clean or ignored or\n" +" source of a copy/move operation, are not listed unless -c (clean),\n" +" -i (ignored), -C (copies) or -A is given. Unless options described\n" +" with \"show only ...\" are given, the options -mardu are used.\n" +"\n" +" Option -q/--quiet hides untracked (unknown and ignored) files\n" +" unless explicitly requested with -u/--unknown or -i/-ignored.\n" +"\n" +" NOTE: status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does not\n" +" report permission changes and diff only reports changes relative\n" +" to one merge parent.\n" +"\n" +" If one revision is given, it is used as the base revision.\n" +" If two revisions are given, the difference between them is shown.\n" +"\n" +" The codes used to show the status of files are:\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = deleted, but still tracked\n" +" ? = not tracked\n" +" I = ignored\n" +" = the previous added file was copied from here\n" +" " +msgstr "" + +msgid "" +"add one or more tags for the current or given revision\n" +"\n" +" Name a particular revision using <name>.\n" +"\n" +" Tags are used to name particular revisions of the repository and are\n" +" very useful to compare different revisions, to go back to significant\n" +" earlier versions or to mark branch points as releases, etc.\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" To facilitate version control, distribution, and merging of tags,\n" +" they are stored as a file named \".hgtags\" which is managed\n" +" similarly to other project files and can be hand-edited if\n" +" necessary. The file '.hg/localtags' is used for local tags (not\n" +" shared among repositories).\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "tag names must be unique" +msgstr "" + +#, python-format +msgid "the name '%s' is reserved" +msgstr "" + +msgid "--rev and --remove are incompatible" +msgstr "" + +#, python-format +msgid "tag '%s' does not exist" +msgstr "" + +#, python-format +msgid "tag '%s' is not a %s tag" +msgstr "" + +#, python-format +msgid "Removed tag %s" +msgstr "" + +#, python-format +msgid "tag '%s' already exists (use -f to force)" +msgstr "" + +#, python-format +msgid "Added tag %s for changeset %s" +msgstr "Tilføjede mærkat %s til ændring %s" + +msgid "" +"list repository tags\n" +"\n" +" This lists both regular and local tags. When the -v/--verbose switch\n" +" is used, a third column \"local\" is printed for local tags.\n" +" " +msgstr "" +"vis arkivmærkater\n" +"\n" +" Viser både normale og lokale mærkater. Når -v/--verbose flaget\n" +" bruges, udskrives en tredje kolonne \"local\" for lokale mærkater.\n" +" " + +msgid "" +"show the tip revision\n" +"\n" +" The tip revision (usually just called the tip) is the most\n" +" recently added changeset in the repository, the most recently\n" +" changed head.\n" +"\n" +" If you have just made a commit, that commit will be the tip. If\n" +" you have just pulled changes from another repository, the tip of\n" +" that repository becomes the current tip. The \"tip\" tag is special\n" +" and cannot be renamed or assigned to a different changeset.\n" +" " +msgstr "" + +msgid "" +"apply one or more changegroup files\n" +"\n" +" Apply one or more compressed changegroup files generated by the\n" +" bundle command.\n" +" " +msgstr "" + +msgid "" +"update working directory\n" +"\n" +" Update the repository's working directory to the specified revision,\n" +" or the tip of the current branch if none is specified. Use null as\n" +" the revision to remove the working copy (like 'hg clone -U').\n" +"\n" +" When the working dir contains no uncommitted changes, it will be\n" +" replaced by the state of the requested revision from the repo. When\n" +" the requested revision is on a different branch, the working dir\n" +" will additionally be switched to that branch.\n" +"\n" +" When there are uncommitted changes, use option -C to discard them,\n" +" forcibly replacing the state of the working dir with the requested\n" +" revision.\n" +"\n" +" When there are uncommitted changes and option -C is not used, and\n" +" the parent revision and requested revision are on the same branch,\n" +" and one of them is an ancestor of the other, then the new working\n" +" directory will contain the requested revision merged with the\n" +" uncommitted changes. Otherwise, the update will fail with a\n" +" suggestion to use 'merge' or 'update -C' instead.\n" +"\n" +" If you want to update just one file to an older revision, use revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for --date.\n" +" " +msgstr "" + +msgid "" +"verify the integrity of the repository\n" +"\n" +" Verify the integrity of the current repository.\n" +"\n" +" This will perform an extensive check of the repository's\n" +" integrity, validating the hashes and checksums of each entry in\n" +" the changelog, manifest, and tracked files, as well as the\n" +" integrity of their crosslinks and indices.\n" +" " +msgstr "" + +msgid "output version and copyright information" +msgstr "" + +#, python-format +msgid "Mercurial Distributed SCM (version %s)\n" +msgstr "Mercurial Distributed SCM (version %s)\n" + +msgid "" +"\n" +"Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +msgid "repository root directory or symbolic path name" +msgstr "" + +msgid "change working directory" +msgstr "skift arbejdsbibliotek" + +msgid "do not prompt, assume 'yes' for any required answers" +msgstr "spørg ikke, antag alle svar er 'ja'" + +msgid "suppress output" +msgstr "undertryk output" + +msgid "enable additional output" +msgstr "" + +msgid "set/override config option" +msgstr "" + +msgid "enable debugging output" +msgstr "" + +msgid "start debugger" +msgstr "" + +msgid "set the charset encoding" +msgstr "" + +msgid "set the charset encoding mode" +msgstr "" + +msgid "print improved command execution profile" +msgstr "" + +msgid "print traceback on exception" +msgstr "" + +msgid "time how long the command takes" +msgstr "" + +msgid "print command execution profile" +msgstr "" + +msgid "output version information and exit" +msgstr "" + +msgid "display help and exit" +msgstr "" + +msgid "do not perform actions, just print output" +msgstr "udfør ingen handlinger, udskriv kun outputttet" + +msgid "specify ssh command to use" +msgstr "specificer ssh kommandoen som skal bruges" + +msgid "specify hg command to run on the remote side" +msgstr "" + +msgid "include names matching the given patterns" +msgstr "inkluder navne som matcher det givne mønster" + +msgid "exclude names matching the given patterns" +msgstr "ekskluder navne som matcher det givne mønster" + +msgid "use <text> as commit message" +msgstr "brug <tekst> som commit-besked" + +msgid "read commit message from <file>" +msgstr "læs commit-beskeden fra <fil>" + +msgid "record datecode as commit date" +msgstr "" + +msgid "record user as committer" +msgstr "" + +msgid "display using template map file" +msgstr "" + +msgid "display with template" +msgstr "" + +msgid "do not show merges" +msgstr "" + +msgid "treat all files as text" +msgstr "behandl alle filer som tekst" + +msgid "don't include dates in diff headers" +msgstr "" + +msgid "show which function each change is in" +msgstr "" + +msgid "ignore white space when comparing lines" +msgstr "" + +msgid "ignore changes in the amount of white space" +msgstr "" + +msgid "ignore changes whose lines are all blank" +msgstr "" + +msgid "number of lines of context to show" +msgstr "" + +msgid "guess renamed files by similarity (0<=s<=100)" +msgstr "" + +msgid "[OPTION]... [FILE]..." +msgstr "" + +msgid "annotate the specified revision" +msgstr "annotér den angivne revision" + +msgid "follow file copies and renames" +msgstr "følg kopier og omdøbninger" + +msgid "list the author (long with -v)" +msgstr "vis forfatteren (lang med -v)" + +msgid "list the date (short with -q)" +msgstr "vis datoen (kort med -q)" + +msgid "list the revision number (default)" +msgstr "vis revisionsnummeret (standard)" + +msgid "list the changeset" +msgstr "vis ændringen" + +msgid "show line number at the first appearance" +msgstr "vil linienummeret for den første forekomst" + +msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." +msgstr "" + +msgid "do not pass files through decoders" +msgstr "" + +msgid "directory prefix for files in archive" +msgstr "" + +msgid "revision to distribute" +msgstr "" + +msgid "type of distribution to create" +msgstr "" + +msgid "[OPTION]... DEST" +msgstr "" + +msgid "merge with old dirstate parent after backout" +msgstr "" + +msgid "parent to choose when backing out merge" +msgstr "" + +msgid "revision to backout" +msgstr "revision som skal bakkes ud" + +msgid "[OPTION]... [-r] REV" +msgstr "" + +msgid "reset bisect state" +msgstr "nulstil bisect" + +msgid "mark changeset good" +msgstr "marker ændring som god" + +msgid "mark changeset bad" +msgstr "marker ændring som dårlig" + +msgid "skip testing changeset" +msgstr "" + +msgid "use command to check changeset state" +msgstr "brug kommando for at tjekke tilstanden af ændringen" + +msgid "do not update to target" +msgstr "undlad at opdatere til målet" + +msgid "[-gbsr] [-c CMD] [REV]" +msgstr "" + +msgid "set branch name even if it shadows an existing branch" +msgstr "" + +msgid "reset branch name to parent branch name" +msgstr "" + +msgid "[-fC] [NAME]" +msgstr "" + +msgid "show only branches that have unmerged heads" +msgstr "" + +msgid "[-a]" +msgstr "" + +msgid "run even when remote repository is unrelated" +msgstr "kør selv hvis fjernarkivet er urelateret" + +msgid "a changeset up to which you would like to bundle" +msgstr "" + +msgid "a base changeset to specify instead of a destination" +msgstr "" + +msgid "bundle all changesets in the repository" +msgstr "" + +msgid "bundle compression type to use" +msgstr "" + +msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "" + +msgid "print output to file with formatted name" +msgstr "" + +msgid "print the given revision" +msgstr "" + +msgid "apply any matching decode filter" +msgstr "" + +msgid "[OPTION]... FILE..." +msgstr "" + +msgid "the clone will only contain a repository (no working copy)" +msgstr "" + +msgid "a changeset you would like to have after cloning" +msgstr "" + +msgid "[OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "mark new/missing files as added/removed before committing" +msgstr "" + +msgid "mark a branch as closed, hiding it from the branch list" +msgstr "" + +msgid "record a copy that has already occurred" +msgstr "" + +msgid "forcibly copy over an existing managed file" +msgstr "" + +msgid "[OPTION]... [SOURCE]... DEST" +msgstr "" + +msgid "[INDEX] REV1 REV2" +msgstr "" + +msgid "show the command options" +msgstr "" + +msgid "[-o] CMD" +msgstr "" + +msgid "try extended date formats" +msgstr "" + +msgid "[-e] DATE [RANGE]" +msgstr "" + +msgid "FILE REV" +msgstr "" + +msgid "[PATH]" +msgstr "" + +msgid "FILE" +msgstr "" + +msgid "parent" +msgstr "" + +msgid "file list" +msgstr "" + +msgid "revision to rebuild to" +msgstr "" + +msgid "[-r REV] [REV]" +msgstr "" + +msgid "revision to debug" +msgstr "" + +msgid "[-r REV] FILE" +msgstr "" + +msgid "REV1 [REV2]" +msgstr "" + +msgid "do not display the saved mtime" +msgstr "" + +msgid "[OPTION]..." +msgstr "" + +msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." +msgstr "" + +msgid "diff against the second parent" +msgstr "" + +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "" + +msgid "end fields with NUL" +msgstr "" + +msgid "print all revisions that match" +msgstr "" + +msgid "follow changeset history, or file history across copies and renames" +msgstr "" + +msgid "ignore case when matching" +msgstr "" + +msgid "print only filenames and revs that match" +msgstr "" + +msgid "print matching line numbers" +msgstr "" + +msgid "search in given revision range" +msgstr "" + +msgid "[OPTION]... PATTERN [FILE]..." +msgstr "" + +msgid "show only heads which are descendants of rev" +msgstr "" + +msgid "show only the active heads from open branches" +msgstr "" + +msgid "[-r REV] [REV]..." +msgstr "" + +msgid "[TOPIC]" +msgstr "" + +msgid "identify the specified rev" +msgstr "" + +msgid "show local revision number" +msgstr "" + +msgid "show global revision id" +msgstr "" + +msgid "show branch" +msgstr "" + +msgid "show tags" +msgstr "vis mærkater" + +msgid "[-nibt] [-r REV] [SOURCE]" +msgstr "" + +msgid "" +"directory strip option for patch. This has the same\n" +"meaning as the corresponding patch option" +msgstr "" + +msgid "base path" +msgstr "" + +msgid "skip check for outstanding uncommitted changes" +msgstr "" + +msgid "don't commit, just update the working directory" +msgstr "" + +msgid "apply patch to the nodes from which it was generated" +msgstr "" + +msgid "Use any branch information in patch (implied by --exact)" +msgstr "" + +msgid "[OPTION]... PATCH..." +msgstr "" + +msgid "show newest record first" +msgstr "" + +msgid "file to store the bundles into" +msgstr "" + +msgid "a specific revision up to which you would like to pull" +msgstr "" + +msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" +msgstr "" + +msgid "[-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "search the repository as it stood at rev" +msgstr "" + +msgid "end filenames with NUL, for use with xargs" +msgstr "" + +msgid "print complete paths from the filesystem root" +msgstr "" + +msgid "[OPTION]... [PATTERN]..." +msgstr "" + +msgid "only follow the first parent of merge changesets" +msgstr "" + +msgid "show revs matching date spec" +msgstr "" + +msgid "show copied files" +msgstr "" + +msgid "do case-insensitive search for a keyword" +msgstr "" + +msgid "include revs where files were removed" +msgstr "" + +msgid "show only merges" +msgstr "" + +msgid "revs committed by user" +msgstr "" + +msgid "show only changesets within the given named branch" +msgstr "" + +msgid "do not display revision or any of its ancestors" +msgstr "" + +msgid "[OPTION]... [FILE]" +msgstr "" + +msgid "revision to display" +msgstr "" + +msgid "[-r REV]" +msgstr "" + +msgid "force a merge with outstanding changes" +msgstr "" + +msgid "revision to merge" +msgstr "" + +msgid "[-f] [[-r] REV]" +msgstr "" + +msgid "a specific revision up to which you would like to push" +msgstr "" + +msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" +msgstr "" + +msgid "show parents from the specified rev" +msgstr "" + +msgid "hg parents [-r REV] [FILE]" +msgstr "" + +msgid "[NAME]" +msgstr "" + +msgid "update to new tip if changesets were pulled" +msgstr "" + +msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "" + +msgid "force push" +msgstr "" + +msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "record delete for missing files" +msgstr "" + +msgid "remove (and delete) file even if added or modified" +msgstr "" + +msgid "record a rename that has already occurred" +msgstr "" + +msgid "[OPTION]... SOURCE... DEST" +msgstr "" + +msgid "remerge all unresolved files" +msgstr "" + +msgid "list state of files needing merge" +msgstr "" + +msgid "mark files as resolved" +msgstr "" + +msgid "unmark files as resolved" +msgstr "" + +msgid "revert all changes when no arguments given" +msgstr "" + +msgid "tipmost revision matching date" +msgstr "" + +msgid "revision to revert to" +msgstr "" + +msgid "do not save backup copies of files" +msgstr "" + +msgid "[OPTION]... [-r REV] [NAME]..." +msgstr "" + +msgid "name of access log file to write to" +msgstr "" + +msgid "name of error log file to write to" +msgstr "" + +msgid "port to listen on (default: 8000)" +msgstr "" + +msgid "address to listen on (default: all interfaces)" +msgstr "" + +msgid "prefix path to serve from (default: server root)" +msgstr "" + +msgid "name to show in web pages (default: working dir)" +msgstr "" + +msgid "name of the webdir config file (serve more than one repo)" +msgstr "" + +msgid "for remote clients" +msgstr "" + +msgid "web templates to use" +msgstr "" + +msgid "template style to use" +msgstr "" + +msgid "use IPv6 in addition to IPv4" +msgstr "" + +msgid "SSL certificate file" +msgstr "" + +msgid "show untrusted configuration options" +msgstr "" + +msgid "[-u] [NAME]..." +msgstr "" + +msgid "show status of all files" +msgstr "" + +msgid "show only modified files" +msgstr "" + +msgid "show only added files" +msgstr "" + +msgid "show only removed files" +msgstr "" + +msgid "show only deleted (but tracked) files" +msgstr "" + +msgid "show only files without changes" +msgstr "" + +msgid "show only unknown (not tracked) files" +msgstr "" + +msgid "show only ignored files" +msgstr "" + +msgid "hide status prefix" +msgstr "" + +msgid "show source of copied files" +msgstr "" + +msgid "show difference from revision" +msgstr "" + +msgid "replace existing tag" +msgstr "" + +msgid "make the tag local" +msgstr "" + +msgid "revision to tag" +msgstr "" + +msgid "remove a tag" +msgstr "" + +msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "" + +msgid "[-p]" +msgstr "" + +msgid "update to new tip if changesets were unbundled" +msgstr "" + +msgid "[-u] FILE..." +msgstr "" + +msgid "overwrite locally modified files (no backup)" +msgstr "" + +msgid "[-C] [-d DATE] [[-r] REV]" +msgstr "" + +msgid "not found in manifest" +msgstr "" + +msgid "branch name not in UTF-8!" +msgstr "" + +#, python-format +msgid " searching for copies back to rev %d\n" +msgstr " søger efter kopier tilbage til revision %d\n" + +#, python-format +msgid "" +" unmatched files in local:\n" +" %s\n" +msgstr "" + +#, python-format +msgid "" +" unmatched files in other:\n" +" %s\n" +msgstr "" + +msgid " all copies found (* = to merge, ! = divergent):\n" +msgstr "" + +#, python-format +msgid " %s -> %s %s\n" +msgstr "" + +msgid " checking for directory renames\n" +msgstr "" + +#, python-format +msgid " dir %s -> %s\n" +msgstr "" + +#, python-format +msgid " file %s -> %s\n" +msgstr "" + +#, python-format +msgid "'\\n' and '\\r' disallowed in filenames: %r" +msgstr "" + +#, python-format +msgid "directory %r already in dirstate" +msgstr "" + +#, python-format +msgid "file %r in dirstate clashes with %r" +msgstr "" + +#, python-format +msgid "not in dirstate: %s\n" +msgstr "" + +msgid "character device" +msgstr "" + +msgid "block device" +msgstr "" + +msgid "fifo" +msgstr "" + +msgid "socket" +msgstr "" + +msgid "directory" +msgstr "" + +#, python-format +msgid "%s: unsupported file type (type is %s)\n" +msgstr "" + +#, python-format +msgid "abort: %s\n" +msgstr "afbrudt: %s\n" + +#, python-format +msgid "" +"hg: command '%s' is ambiguous:\n" +" %s\n" +msgstr "" +"hg: kommandoen '%s' is tvetydig:\n" +" %s\n" + +#, python-format +msgid "timed out waiting for lock held by %s" +msgstr "" + +#, python-format +msgid "lock held by %s" +msgstr "" + +#, python-format +msgid "abort: %s: %s\n" +msgstr "afbrudt: %s: %s\n" + +#, python-format +msgid "abort: could not lock %s: %s\n" +msgstr "afbrudt: kunne ikke låse %s: %s\n" + +#, python-format +msgid "hg %s: %s\n" +msgstr "hg %s: %s\n" + +#, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format +msgid "abort: %s!\n" +msgstr "afbrudt: %s!\n" + +#, python-format +msgid "abort: %s" +msgstr "afbrudt: %s" + +msgid " empty string\n" +msgstr " tom streng\n" + +msgid "killed!\n" +msgstr "dræbt!\n" + +#, python-format +msgid "hg: unknown command '%s'\n" +msgstr "hg: ukendt kommando '%s'\n" + +#, python-format +msgid "abort: could not import module %s!\n" +msgstr "afbrudt: kunne ikke importere modul %s!\n" + +msgid "(did you forget to compile extensions?)\n" +msgstr "(glemte du at kompilere udvidelserne?)\n" + +msgid "(is your Python install correct?)\n" +msgstr "(er din Python installeret korrekt?)\n" + +#, python-format +msgid "abort: error: %s\n" +msgstr "" + +msgid "broken pipe\n" +msgstr "" + +msgid "interrupted!\n" +msgstr "standset!\n" + +msgid "" +"\n" +"broken pipe\n" +msgstr "" + +msgid "abort: out of memory\n" +msgstr "afbrudt: løbet tør for hukommelse\n" + +msgid "** unknown exception encountered, details follow\n" +msgstr "** der opstod en ukendt fejl, detaljer følger\n" + +msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgstr "** angiv fejldetaljer på http://www.selenic.com/mercurial/bts\n" + +msgid "** or mercurial@selenic.com\n" +msgstr "** eller mercurial@selenic.com\n" + +#, python-format +msgid "** Mercurial Distributed SCM (version %s)\n" +msgstr "** Mercurial Distributed SCM (version %s)\n" + +#, python-format +msgid "** Extensions loaded: %s\n" +msgstr "" + +#, python-format +msgid "malformed --config option: %s" +msgstr "" + +#, python-format +msgid "extension '%s' overrides commands: %s\n" +msgstr "" + +msgid "Option --config may not be abbreviated!" +msgstr "" + +msgid "Option --cwd may not be abbreviated!" +msgstr "" + +msgid "" +"Option -R has to be separated from other options (i.e. not -qR) and --" +"repository may only be abbreviated as --repo!" +msgstr "" + +#, python-format +msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" +msgstr "" + +#, python-format +msgid "repository '%s' is not local" +msgstr "" + +msgid "invalid arguments" +msgstr "" + +msgid "exception raised - generating profile anyway\n" +msgstr "" + +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" + +#, python-format +msgid "*** failed to import extension %s from %s: %s\n" +msgstr "" + +#, python-format +msgid "*** failed to import extension %s: %s\n" +msgstr "" + +#, python-format +msgid "couldn't find merge tool %s\n" +msgstr "" + +#, python-format +msgid "tool %s can't handle symlinks\n" +msgstr "" + +#, python-format +msgid "tool %s can't handle binary\n" +msgstr "" + +#, python-format +msgid "tool %s requires a GUI\n" +msgstr "" + +#, python-format +msgid "picked tool '%s' for %s (binary %s symlink %s)\n" +msgstr "" + +#, python-format +msgid "" +" no tool found to merge %s\n" +"keep (l)ocal or take (o)ther?" +msgstr "" + +msgid "[lo]" +msgstr "" + +msgid "l" +msgstr "" + +#, python-format +msgid "merging %s and %s to %s\n" +msgstr "" + +#, python-format +msgid "merging %s\n" +msgstr "" + +#, python-format +msgid "my %s other %s ancestor %s\n" +msgstr "" + +msgid " premerge successful\n" +msgstr "" + +#, python-format +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +msgid "[yn]" +msgstr "" + +msgid "n" +msgstr "" + +#, python-format +msgid "merging %s failed!\n" +msgstr "" + +#, python-format +msgid "Inconsistent state, %s:%s is good and bad" +msgstr "" + +#, python-format +msgid "unknown bisect kind %s" +msgstr "" + +msgid "Date Formats" +msgstr "Datoformater" + +msgid "" +"\n" +" Some commands allow the user to specify a date, e.g.:\n" +" * backout, commit, import, tag: Specify the commit date.\n" +" * log, revert, update: Select revision(s) by date.\n" +"\n" +" Many date formats are valid. Here are some examples:\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +" Lastly, there is Mercurial's internal format:\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +" This is the internal representation format for dates. unixtime is\n" +" the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n" +" is the offset of the local timezone, in seconds west of UTC (negative\n" +" if the timezone is east of UTC).\n" +"\n" +" The log command also accepts date ranges:\n" +"\n" +" \"<{date}\" - on or before a given date\n" +" \">{date}\" - on or after a given date\n" +" \"{date} to {date}\" - a date range, inclusive\n" +" \"-{days}\" - within a given number of days of today\n" +" " +msgstr "" +"\n" +" Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n" +" * backout, commit, import, tag: specificer commit-datoen.\n" +" * log, revert, update: vælg revisioner efter dato.\n" +"\n" +" Der er mange gyldige datoformater. Her er nogle eksempler:\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n" +" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n" +" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n" +" \"Dec 6\" (midnat)\n" +" \"13:18\" (antager dags dato)\n" +" \"3:39\"\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (6. dec. 2006)\n" +"\n" +" Endelig er der Mercurials interne format:\n" +"\n" +" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n" +"\n" +" Dette er den interne repræsentation af datoer. unixtime er\n" +" antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n" +" UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n" +" for UTC (negativ hvis tidszonen er øst for UTC).\n" +"\n" +" Kommandoen log accepterer også datointervaller:\n" +"\n" +" \"<{date}\" - på eller før den angivne dato\n" +" \">{date}\" - på eller efter den angivne dato\n" +" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n" +" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n" +" " + +msgid "File Name Patterns" +msgstr "" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying one or more\n" +" files at a time.\n" +"\n" +" By default, Mercurial treats filenames as shell-style extended\n" +" glob patterns.\n" +"\n" +" Alternate pattern notations must be specified explicitly.\n" +"\n" +" To use a plain path name without any pattern matching, start a\n" +" name with \"path:\". These path names must match completely, from\n" +" the root of the current repository.\n" +"\n" +" To use an extended glob, start a name with \"glob:\". Globs are\n" +" rooted at the current directory; a glob such as \"*.c\" will match\n" +" files ending in \".c\" in the current directory only.\n" +"\n" +" The supported glob syntax extensions are \"**\" to match any string\n" +" across path separators, and \"{a,b}\" to mean \"a or b\".\n" +"\n" +" To use a Perl/Python regular expression, start a name with \"re:\".\n" +" Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +" Plain examples:\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root of\n" +" the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +" Glob examples:\n" +"\n" +" glob:*.c any name ending in \".c\" in the current directory\n" +" *.c any name ending in \".c\" in the current directory\n" +" **.c any name ending in \".c\" in the current directory, or\n" +" any subdirectory\n" +" foo/*.c any name ending in \".c\" in the directory foo\n" +" foo/**.c any name ending in \".c\" in the directory foo, or any\n" +" subdirectory\n" +"\n" +" Regexp examples:\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +"\n" +" " +msgstr "" + +msgid "Environment Variables" +msgstr "Miljøvariable" + +msgid "" +"\n" +"HG::\n" +" Path to the 'hg' executable, automatically passed when running hooks,\n" +" extensions or external tools. If unset or empty, an executable named\n" +" 'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n" +"\n" +"HGEDITOR::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING::\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE::\n" +" This sets Mercurial's behavior for handling unknown characters\n" +" while transcoding user inputs. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't translate a character. Other\n" +" settings include \"replace\", which replaces unknown characters, and\n" +" \"ignore\", which drops them. This setting can be overridden with\n" +" the --encodingmode command-line option.\n" +"\n" +"HGMERGE::\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGRCPATH::\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only .hg/hgrc of\n" +" current repository is read.\n" +"\n" +" For each element in path, if a directory, all entries in directory\n" +" ending with \".rc\" are added to path. Else, element itself is\n" +" added to path.\n" +"\n" +"HGUSER::\n" +" This is the string used for the author of a commit.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL::\n" +" If HGUSER is not set, this will be used as the author for a commit.\n" +"\n" +"LOGNAME::\n" +" If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n" +" '@hostname' appended) as the author value for a commit.\n" +"\n" +"VISUAL::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"EDITOR::\n" +" Sometimes Mercurial needs to open a text file in an editor\n" +" for a user to modify, for example when writing commit messages.\n" +" The editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH::\n" +" This is used by Python to find imported modules and may need to be set\n" +" appropriately if Mercurial is not installed system-wide.\n" +" " +msgstr "" + +msgid "Specifying Single Revisions" +msgstr "Angivning af en enkelt revision" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying individual\n" +" revisions.\n" +"\n" +" A plain integer is treated as a revision number. Negative\n" +" integers are treated as offsets from the tip, with -1 denoting the\n" +" tip.\n" +"\n" +" A 40-digit hexadecimal string is treated as a unique revision\n" +" identifier.\n" +"\n" +" A hexadecimal string less than 40 characters long is treated as a\n" +" unique revision identifier, and referred to as a short-form\n" +" identifier. A short-form identifier is only valid if it is the\n" +" prefix of one full-length identifier.\n" +"\n" +" Any other string is treated as a tag name, which is a symbolic\n" +" name associated with a revision identifier. Tag names may not\n" +" contain the \":\" character.\n" +"\n" +" The reserved name \"tip\" is a special tag that always identifies\n" +" the most recent revision.\n" +"\n" +" The reserved name \"null\" indicates the null revision. This is the\n" +" revision of an empty repository, and the parent of revision 0.\n" +"\n" +" The reserved name \".\" indicates the working directory parent. If\n" +" no working directory is checked out, it is equivalent to null.\n" +" If an uncommitted merge is in progress, \".\" is the revision of\n" +" the first parent.\n" +" " +msgstr "" + +msgid "Specifying Multiple Revisions" +msgstr "Angivning af flere revisioner" + +msgid "" +"\n" +" When Mercurial accepts more than one revision, they may be\n" +" specified individually, or provided as a continuous range,\n" +" separated by the \":\" character.\n" +"\n" +" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" +" are revision identifiers. Both BEGIN and END are optional. If\n" +" BEGIN is not specified, it defaults to revision number 0. If END\n" +" is not specified, it defaults to the tip. The range \":\" thus\n" +" means \"all revisions\".\n" +"\n" +" If BEGIN is greater than END, revisions are treated in reverse\n" +" order.\n" +"\n" +" A range acts as a closed interval. This means that a range of 3:5\n" +" gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.\n" +" " +msgstr "" + +msgid "Diff Formats" +msgstr "" + +msgid "" +"\n" +" Mercurial's default format for showing changes between two versions\n" +" of a file is compatible with the unified format of GNU diff, which\n" +" can be used by GNU patch and many other standard tools.\n" +"\n" +" While this standard format is often enough, it does not encode the\n" +" following information:\n" +"\n" +" - executable status\n" +" - copy or rename information\n" +" - changes in binary files\n" +" - creation or deletion of empty files\n" +"\n" +" Mercurial also supports the extended diff format from the git VCS\n" +" which addresses these limitations. The git diff format is not\n" +" produced by default because there are very few tools which\n" +" understand this format.\n" +"\n" +" This means that when generating diffs from a Mercurial repository\n" +" (e.g. with \"hg export\"), you should be careful about things like\n" +" file copies and renames or other things mentioned above, because\n" +" when applying a standard diff to a different repository, this extra\n" +" information is lost. Mercurial's internal operations (like push and\n" +" pull) are not affected by this, because they use an internal binary\n" +" format for communicating changes.\n" +"\n" +" To make Mercurial produce the git extended diff format, use the\n" +" --git option available for many commands, or set 'git = True' in the\n" +" [diff] section of your hgrc. You do not need to set this option when\n" +" importing diffs in this format or using them in the mq extension.\n" +" " +msgstr "" + +msgid "Template Usage" +msgstr "" + +msgid "" +"\n" +" Mercurial allows you to customize output of commands through\n" +" templates. You can either pass in a template from the command line,\n" +" via the --template option, or select an existing template-style (--" +"style).\n" +"\n" +" You can customize output for any \"log-like\" command: log, outgoing,\n" +" incoming, tip, parents, heads and glog are all template-enabled.\n" +"\n" +" Three styles are packaged with Mercurial: default (the style used\n" +" when no explicit preference is passed), compact and changelog. Usage:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" A template is a piece of text, with markup to invoke variable " +"expansion:\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" Strings in curly braces are called keywords. The availability of\n" +" keywords depends on the exact context of the templater. These keywords\n" +" are usually available for templating a log-like command:\n" +"\n" +" - author: String. The unmodified author of the changeset.\n" +" - branches: String. The name of the branch on which the changeset\n" +" was committed. Will be empty if the branch name was default.\n" +" - date: Date information. The date when the changeset was committed.\n" +" - desc: String. The text of the changeset description.\n" +" - files: List of strings. All files modified, added, or removed by\n" +" this changeset.\n" +" - file_adds: List of strings. Files added by this changeset.\n" +" - file_mods: List of strings. Files modified by this changeset.\n" +" - file_dels: List of strings. Files removed by this changeset.\n" +" - node: String. The changeset identification hash, as a 40-character\n" +" hexadecimal string.\n" +" - parents: List of strings. The parents of the changeset.\n" +" - rev: Integer. The repository-local changeset revision number.\n" +" - tags: List of strings. Any tags associated with the changeset.\n" +"\n" +" The \"date\" keyword does not produce human-readable output. If you\n" +" want to use a date in your output, you can use a filter to process it.\n" +" Filters are functions which return a string based on the input " +"variable.\n" +" You can also use a chain of filters to get the wanted output:\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" List of filters:\n" +"\n" +" - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" +" every line except the last.\n" +" - age: Date. Returns a human-readable age for the given date.\n" +" - basename: Any text. Treats the text as a path, and returns the\n" +" basename. For example, \"foo/bar/baz\" becomes \"baz\".\n" +" - date: Date. Returns a date in a Unix date command format, including\n" +" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" +" - domain: Any text. Finds the first string that looks like an email\n" +" address, and extracts just the domain component.\n" +" - email: Any text. Extracts the first string that looks like an email\n" +" address.\n" +" - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" +" \"<\" and \">\" with XML entities.\n" +" - fill68: Any text. Wraps the text to fit in 68 columns.\n" +" - fill76: Any text. Wraps the text to fit in 76 columns.\n" +" - firstline: Any text. Returns the first line of text.\n" +" - hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +" - isodate: Date. Returns the date in ISO 8601 format.\n" +" - obfuscate: Any text. Returns the input text rendered as a sequence\n" +" of XML entities.\n" +" - person: Any text. Returns the text before an email address.\n" +" - rfc822date: Date. Returns a date using the same format used\n" +" in email headers.\n" +" - short: Changeset hash. Returns the short form of a changeset hash,\n" +" i.e. a 12-byte hexadecimal string.\n" +" - shortdate: Date. Returns a date like \"2006-09-04\".\n" +" - strip: Any text. Strips all leading and trailing whitespace.\n" +" - tabindent: Any text. Returns the text, with every line except the\n" +" first starting with a tab character.\n" +" - urlescape: Any text. Escapes all \"special\" characters. For example,\n" +" \"foo bar\" becomes \"foo%20bar\".\n" +" - user: Any text. Returns the user portion of an email address.\n" +" " +msgstr "" + +msgid "Url Paths" +msgstr "URL-stier" + +msgid "" +"\n" +" Valid URLs are of the form:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" Paths in the local filesystem can either point to Mercurial\n" +" repositories or to bundle files (as created by 'hg bundle' or\n" +" 'hg incoming --bundle').\n" +"\n" +" An optional identifier after # indicates a particular branch, tag,\n" +" or changeset to deal with in the remote repository.\n" +"\n" +" Some features, such as pushing to http:// and https:// URLs are\n" +" only possible if the feature is explicitly enabled on the\n" +" remote Mercurial server.\n" +"\n" +" Some notes about using SSH with Mercurial:\n" +" - SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +" - path is relative to the remote user's home directory by default.\n" +" Use an extra slash at the start of a path to specify an absolute " +"path:\n" +" ssh://example.com//tmp/repository\n" +" - Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +" These urls can all be stored in your hgrc with path aliases under the\n" +" [paths] section like so:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" You can then use the alias for any command that uses a url (for example\n" +" 'hg pull alias1' would pull from the 'alias1' path).\n" +"\n" +" Two path aliases are more important because they are used as defaults\n" +" when you do not provide the url to a command:\n" +"\n" +" default:\n" +" When you create a repository with hg clone, the clone command saves\n" +" the location of the source repository as the 'default' path. This is\n" +" then used when you omit a path from the push and pull commands.\n" +"\n" +" default-push:\n" +" The push command will look for a path named 'default-push', and\n" +" prefer it over 'default' if both are defined.\n" +" " +msgstr "" + +#, python-format +msgid "destination directory: %s\n" +msgstr "" + +#, python-format +msgid "destination '%s' already exists" +msgstr "" + +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" +msgstr "" + +msgid "clone from remote to remote not supported" +msgstr "" + +msgid "updating working directory\n" +msgstr "opdaterer arbejdsbibliotek\n" + +msgid "updated" +msgstr "opdateret" + +msgid "merged" +msgstr "sammenføjet" + +msgid "removed" +msgstr "fjernet" + +msgid "unresolved" +msgstr "uløst" + +#, python-format +msgid "%d files %s" +msgstr "%d filer %s" + +msgid "use 'hg resolve' to retry unresolved file merges\n" +msgstr "" + +msgid "(branch merge, don't forget to commit)\n" +msgstr "" + +#, python-format +msgid "error reading %s/.hg/hgrc: %s\n" +msgstr "" + +msgid "SSL support is unavailable" +msgstr "understøttelse for SSL er ikke tilstede" + +msgid "IPv6 not available on this system" +msgstr "IPv6 er ikke til rådighed på dette system" + +#, python-format +msgid "cannot start server at '%s:%d': %s" +msgstr "kan ikke starte server på '%s:%d': %s" + +#, python-format +msgid "calling hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" not in a module)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (import of \"%s\" failed)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not defined)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not callable)" +msgstr "" + +#, python-format +msgid "error: %s hook failed: %s\n" +msgstr "" + +#, python-format +msgid "error: %s hook raised an exception: %s\n" +msgstr "" + +#, python-format +msgid "%s hook failed" +msgstr "" + +#, python-format +msgid "warning: %s hook failed\n" +msgstr "" + +#, python-format +msgid "running hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook %s" +msgstr "" + +#, python-format +msgid "warning: %s hook %s\n" +msgstr "" + +msgid "connection ended unexpectedly" +msgstr "forbindelsen blev uventet afsluttet" + +#, python-format +msgid "unsupported URL component: \"%s\"" +msgstr "ikke-understøttet URL-komponent: \"%s\"" + +#, python-format +msgid "using %s\n" +msgstr "bruger %s\n" + +#, python-format +msgid "capabilities: %s\n" +msgstr "kapaciteter: %s\n" + +msgid "operation not supported over http" +msgstr "operationen understøttes ikke over http" + +#, python-format +msgid "sending %s command\n" +msgstr "sender %s kommando\n" + +#, python-format +msgid "sending %s bytes\n" +msgstr "sender %s bytes\n" + +msgid "authorization failed" +msgstr "autorisation fejlede" + +#, python-format +msgid "http error while sending %s command\n" +msgstr "" + +msgid "http error, possibly caused by proxy setting" +msgstr "" + +#, python-format +msgid "real URL is %s\n" +msgstr "den rigtige URL er %s\n" + +#, python-format +msgid "Requested URL: '%s'\n" +msgstr "" + +#, python-format +msgid "'%s' does not appear to be an hg repository" +msgstr "" + +#, python-format +msgid "'%s' sent a broken Content-Type header (%s)" +msgstr "" + +#, python-format +msgid "'%s' uses newer protocol %s" +msgstr "'%s' bruger nyere protokol %s" + +msgid "look up remote revision" +msgstr "" + +msgid "unexpected response:" +msgstr "" + +msgid "look up remote changes" +msgstr "" + +msgid "push failed (unexpected response):" +msgstr "" + +#, python-format +msgid "push failed: %s" +msgstr "skub fejlede: %s" + +msgid "Python support for SSL and HTTPS is not installed" +msgstr "" + +msgid "cannot create new http repository" +msgstr "kan ikke lave nyt http arkiv" + +#, python-format +msgid "%s: ignoring invalid syntax '%s'\n" +msgstr "%s: ignorerer ugyldig syntaks '%s'\n" + +#, python-format +msgid "skipping unreadable ignore file '%s': %s\n" +msgstr "" + +#, python-format +msgid "repository %s not found" +msgstr "arkivet %s blev ikke fundet" + +#, python-format +msgid "repository %s already exists" +msgstr "arkivet %s eksisterer allerede" + +#, python-format +msgid "requirement '%s' not supported" +msgstr "" + +#, python-format +msgid "%r cannot be used in a tag name" +msgstr "" + +msgid "working copy of .hgtags is changed (please commit .hgtags manually)" +msgstr "" + +#, python-format +msgid "%s, line %s: %s\n" +msgstr "%s, linie %s: %s\n" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + +#, python-format +msgid "tag '%s' refers to unknown node" +msgstr "" + +#, python-format +msgid "unknown revision '%s'" +msgstr "ukendt revision '%s'" + +#, python-format +msgid "filtering %s through %s\n" +msgstr "filtrerer %s gennem %s\n" + +msgid "journal already exists - run hg recover" +msgstr "" + +msgid "rolling back interrupted transaction\n" +msgstr "" + +msgid "no interrupted transaction available\n" +msgstr "" + +msgid "rolling back last transaction\n" +msgstr "" + +#, python-format +msgid "Named branch could not be reset, current branch still is: %s\n" +msgstr "" + +msgid "no rollback information available\n" +msgstr "" + +#, python-format +msgid "waiting for lock on %s held by %r\n" +msgstr "" + +#, python-format +msgid "repository %s" +msgstr "arkiv %s" + +#, python-format +msgid "working directory of %s" +msgstr "arbejdsbibliotek for %s" + +#, python-format +msgid " %s: searching for copy revision for %s\n" +msgstr "" + +#, python-format +msgid " %s: copy %s:%s\n" +msgstr "" + +msgid "cannot partially commit a merge (do not specify files or patterns)" +msgstr "" + +#, python-format +msgid "%s not tracked!\n" +msgstr "" + +msgid "unresolved merge conflicts (see hg resolve)" +msgstr "" + +msgid "nothing changed\n" +msgstr "" + +#, python-format +msgid "trouble committing %s!\n" +msgstr "" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "" + +msgid "empty commit message" +msgstr "" + +#, python-format +msgid "%s does not exist!\n" +msgstr "" + +#, python-format +msgid "" +"%s: files over 10MB may cause memory and performance problems\n" +"(use 'hg revert %s' to unadd the file)\n" +msgstr "" + +#, python-format +msgid "%s not added: only files and symlinks supported currently\n" +msgstr "" + +#, python-format +msgid "%s already tracked!\n" +msgstr "" + +#, python-format +msgid "%s not added!\n" +msgstr "" + +#, python-format +msgid "%s still exists!\n" +msgstr "" + +#, python-format +msgid "%s not removed!\n" +msgstr "" + +#, python-format +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "" + +msgid "searching for changes\n" +msgstr "leder efter ændringer\n" + +#, python-format +msgid "examining %s:%s\n" +msgstr "undersøger %s:%s\n" + +msgid "branch already found\n" +msgstr "gren er allerede fundet\n" + +#, python-format +msgid "found incomplete branch %s:%s\n" +msgstr "fandt ukomplet gren %s:%s\n" + +#, python-format +msgid "found new changeset %s\n" +msgstr "fandt ny ændring %s\n" + +#, python-format +msgid "request %d: %s\n" +msgstr "forespørgsel %d: %s\n" + +#, python-format +msgid "received %s:%s\n" +msgstr "modtog %s:%s\n" + +#, python-format +msgid "narrowing %d:%d %s\n" +msgstr "indskrænker %d:%d %s\n" + +#, python-format +msgid "found new branch changeset %s\n" +msgstr "fandt ny forgreningsændring %s\n" + +#, python-format +msgid "narrowed branch search to %s:%s\n" +msgstr "indskrænker forgreningssøgning til %s:%s\n" + +msgid "already have changeset " +msgstr "har allerede ændringen " + +msgid "warning: repository is unrelated\n" +msgstr "advarsel: arkivet er urelateret\n" + +msgid "repository is unrelated" +msgstr "arkivet er urelateret" + +msgid "found new changesets starting at " +msgstr "fandt nye ændringer startende ved " + +#, python-format +msgid "%d total queries\n" +msgstr "%d forespørgsler i alt\n" + +msgid "common changesets up to " +msgstr "fælles ændringer op til " + +msgid "requesting all changes\n" +msgstr "anmoder om alle ændringer\n" + +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." +msgstr "" + +msgid "abort: push creates new remote heads!\n" +msgstr "" + +msgid "(did you forget to merge? use push -f to force)\n" +msgstr "" + +msgid "note: unsynced remote changes!\n" +msgstr "" + +#, python-format +msgid "%d changesets found\n" +msgstr "" + +msgid "list of changesets:\n" +msgstr "" + +#, python-format +msgid "empty or missing revlog for %s" +msgstr "" + +#, python-format +msgid "add changeset %s\n" +msgstr "tilføj ændring %s\n" + +msgid "adding changesets\n" +msgstr "tilføjer ændringer\n" + +msgid "received changelog group is empty" +msgstr "" + +msgid "adding manifests\n" +msgstr "tilføjer manifester\n" + +msgid "adding file changes\n" +msgstr "tilføjer filændringer\n" + +#, python-format +msgid "adding %s revisions\n" +msgstr "tilføjer %s ændringer\n" + +msgid "received file revlog group is empty" +msgstr "" + +#, python-format +msgid " (%+d heads)" +msgstr " (%+d hoveder)" + +#, python-format +msgid "added %d changesets with %d changes to %d files%s\n" +msgstr "tilføjede %d ændringer med %d ændringer i %d filer%s\n" + +msgid "updating the branch cache\n" +msgstr "" + +msgid "Unexpected response from remote server:" +msgstr "" + +msgid "operation forbidden by server" +msgstr "" + +msgid "locking the remote repository failed" +msgstr "" + +msgid "the server sent an unknown error code" +msgstr "" + +msgid "streaming all changes\n" +msgstr "" + +#, python-format +msgid "%d files to transfer, %s of data\n" +msgstr "" + +#, python-format +msgid "adding %s (%s)\n" +msgstr "tilføjer %s (%s)\n" + +#, python-format +msgid "transferred %s in %.1f seconds (%s/sec)\n" +msgstr "" + +msgid "no [smtp]host in hgrc - cannot send mail" +msgstr "" + +#, python-format +msgid "sending mail: smtp host %s, port %s\n" +msgstr "" + +msgid "can't use TLS: Python SSL support not installed" +msgstr "" + +msgid "(using tls)\n" +msgstr "" + +#, python-format +msgid "(authenticating to mail server as %s)\n" +msgstr "" + +#, python-format +msgid "sending mail: %s\n" +msgstr "" + +msgid "smtp specified as email transport, but no smtp host configured" +msgstr "" + +#, python-format +msgid "%r specified as email transport, but not in PATH" +msgstr "" + +#, python-format +msgid "ignoring invalid sendcharset: %s\n" +msgstr "" + +#, python-format +msgid "invalid email address: %s" +msgstr "" + +#, python-format +msgid "invalid local address: %s" +msgstr "" + +msgid "'\\n' and '\\r' disallowed in filenames" +msgstr "" + +#, python-format +msgid "failed to remove %s from manifest" +msgstr "" + +#, python-format +msgid "diff context lines count must be an integer, not %r" +msgstr "" + +#, python-format +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" +msgstr "" + +#, python-format +msgid "case-folding collision between %s and %s" +msgstr "" + +msgid "resolving manifests\n" +msgstr "" + +#, python-format +msgid " overwrite %s partial %s\n" +msgstr "" + +#, python-format +msgid " ancestor %s local %s remote %s\n" +msgstr "" + +#, python-format +msgid "" +" conflicting flags for %s\n" +"(n)one, e(x)ec or sym(l)ink?" +msgstr "" + +#, python-format +msgid "" +" local changed %s which remote deleted\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +msgid "[cd]" +msgstr "" + +msgid "c" +msgstr "" + +#, python-format +msgid "" +"remote changed %s which local deleted\n" +"use (c)hanged version or leave (d)eleted?" +msgstr "" + +#, python-format +msgid "preserving %s for resolve of %s\n" +msgstr "" + +#, python-format +msgid "update failed to remove %s: %s!\n" +msgstr "" + +#, python-format +msgid "getting %s\n" +msgstr "henter %s\n" + +#, python-format +msgid "moving %s to %s\n" +msgstr "" + +#, python-format +msgid "getting %s to %s\n" +msgstr "" + +#, python-format +msgid "warning: detected divergent renames of %s to:\n" +msgstr "" + +#, python-format +msgid "branch %s not found" +msgstr "" + +msgid "can't merge with ancestor" +msgstr "" + +msgid "nothing to merge (use 'hg update' or check 'hg heads')" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C')" +msgstr "" + +msgid "crosses named branches (use 'hg update -C' to discard changes)" +msgstr "" + +#, python-format +msgid "cannot create %s: destination already exists" +msgstr "" + +#, python-format +msgid "cannot create %s: unable to create destination directory" +msgstr "" + +#, python-format +msgid "found patch at byte %d\n" +msgstr "" + +msgid "patch generated by hg export\n" +msgstr "" + +#, python-format +msgid "unable to find '%s' for patching\n" +msgstr "" + +#, python-format +msgid "patching file %s\n" +msgstr "retter fil %s\n" + +#, python-format +msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d %s (%d %d %d %d)" +msgstr "" + +#, python-format +msgid "file %s already exists\n" +msgstr "filen %s eksisterer allerede\n" + +#, python-format +msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" +msgstr "" + +#, python-format +msgid "Hunk #%d FAILED at %d\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d" +msgstr "" + +#, python-format +msgid "bad hunk #%d old text line %d" +msgstr "" + +msgid "could not extract binary patch" +msgstr "" + +#, python-format +msgid "binary patch is %d bytes, not %d" +msgstr "" + +#, python-format +msgid "unable to strip away %d dirs from %s" +msgstr "" + +msgid "undefined source and destination files" +msgstr "" + +#, python-format +msgid "malformed patch %s %s" +msgstr "" + +#, python-format +msgid "unsupported parser state: %s" +msgstr "" + +#, python-format +msgid "patch command failed: %s" +msgstr "" + +#, python-format +msgid "no valid hunks found; trying with %r instead\n" +msgstr "" + +#, python-format +msgid "saving bundle to %s\n" +msgstr "" + +msgid "adding branch\n" +msgstr "tilføjer gren\n" + +#, python-format +msgid "cannot %s; remote repository does not support the %r capability" +msgstr "" + +#, python-format +msgid "unknown compression type %r" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for format v0" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for revlogng" +msgstr "" + +#, python-format +msgid "index %s unknown format %d" +msgstr "" + +msgid "no node" +msgstr "" + +msgid "ambiguous identifier" +msgstr "" + +msgid "no match found" +msgstr "" + +#, python-format +msgid "incompatible revision flag %x" +msgstr "" + +#, python-format +msgid "%s not found in the transaction" +msgstr "" + +msgid "unknown base" +msgstr "" + +msgid "consistency error adding group" +msgstr "" + +#, python-format +msgid "%s looks like a binary file." +msgstr "" + +msgid "can only specify two labels." +msgstr "" + +msgid "warning: conflicts during merge.\n" +msgstr "" + +#, python-format +msgid "couldn't parse location %s" +msgstr "" + +msgid "could not create remote repo" +msgstr "" + +msgid "remote: " +msgstr "fjern: " + +msgid "no suitable response from remote hg" +msgstr "" + +#, python-format +msgid "push refused: %s" +msgstr "" + +msgid "unsynced changes" +msgstr "" + +msgid "cannot lock static-http repository" +msgstr "" + +msgid "cannot create new static-http repository" +msgstr "" + +#, python-format +msgid "invalid entry in fncache, line %s" +msgstr "" + +msgid "scanning\n" +msgstr "" + +#, python-format +msgid "%d files, %d bytes to transfer\n" +msgstr "%d filer, skal overføre %d bytes\n" + +#, python-format +msgid "sending %s (%d bytes)\n" +msgstr "" + +msgid "unmatched quotes" +msgstr "" + +#, python-format +msgid "style not found: %s" +msgstr "" + +#, python-format +msgid "%s:%s: parse error" +msgstr "" + +#, python-format +msgid "template file %s: %s" +msgstr "" + +#, python-format +msgid "Error expanding '%s%%%s'" +msgstr "" + +msgid "transaction abort!\n" +msgstr "" + +#, python-format +msgid "failed to truncate %s\n" +msgstr "" + +msgid "rollback completed\n" +msgstr "" + +#, python-format +msgid "Not trusting file %s from untrusted user %s, group %s\n" +msgstr "" + +#, python-format +msgid "" +"Failed to parse %s\n" +"%s" +msgstr "" + +#, python-format +msgid "Ignored: %s\n" +msgstr "Ignoreret: %s\n" + +#, python-format +msgid "unable to open %s: %s" +msgstr "kunne ikke åbne %s: %s" + +#, python-format +msgid "" +"failed to parse %s\n" +"%s" +msgstr "" + +#, python-format +msgid "" +"Error in configuration section [%s] parameter '%s':\n" +"%s" +msgstr "" + +#, python-format +msgid "Ignoring untrusted configuration option %s.%s = %s\n" +msgstr "" + +#, python-format +msgid "" +"Error in configuration section [%s]:\n" +"%s" +msgstr "" + +msgid "enter a commit username:" +msgstr "angiv et commit brugernavn:" + +#, python-format +msgid "No username found, using '%s' instead\n" +msgstr "Fandt intet brugernavn, bruger '%s' istedet\n" + +msgid "Please specify a username." +msgstr "Angiv venligst et brugernavn." + +#, python-format +msgid "username %s contains a newline\n" +msgstr "brugernavn %s indeholder et linieskift\n" + +msgid "unrecognized response\n" +msgstr "" + +msgid "response expected" +msgstr "" + +msgid "password: " +msgstr "kodeord: " + +msgid "edit failed" +msgstr "redigering fejlede" + +msgid "http authorization required" +msgstr "" + +msgid "http authorization required\n" +msgstr "" + +#, python-format +msgid "realm: %s\n" +msgstr "" + +#, python-format +msgid "user: %s\n" +msgstr "bruger: %s\n" + +msgid "user:" +msgstr "bruger:" + +#, python-format +msgid "proxying through http://%s:%s\n" +msgstr "" + +#, python-format +msgid "http auth: user %s, password %s\n" +msgstr "http godkendelse: bruger %s, kodeord %s\n" + +#, python-format +msgid "%s, please check your locale settings" +msgstr "%s, tjek venligst dine sprogindstillinger" + +#, python-format +msgid "command '%s' failed: %s" +msgstr "kommandoen '%s' fejlede: %s" + +#, python-format +msgid "path contains illegal component: %s" +msgstr "stien indeholder ugyldig komponent: %s" + +#, python-format +msgid "path %r is inside repo %r" +msgstr "stien %r er inde i repo %r" + +#, python-format +msgid "path %r traverses symbolic link %r" +msgstr "stien %r følger symbolsk link %r" + +msgid "Hardlinks not supported" +msgstr "Hardlinks er ikke supporteret" + +msgid "user name not available - set USERNAME environment variable" +msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel" + +#, python-format +msgid "exited with status %d" +msgstr "afsluttede med status %d" + +#, python-format +msgid "killed by signal %d" +msgstr "dræbt af signal %d" + +#, python-format +msgid "stopped by signal %d" +msgstr "stoppet af signal %d" + +msgid "invalid exit code" +msgstr "ugyldig returkode" + +#, python-format +msgid "could not symlink to %r: %s" +msgstr "kunne ikke lave et symbolsk link til %r: %s" + +#, python-format +msgid "invalid date: %r " +msgstr "ugyldig dato: %r " + +#, python-format +msgid "date exceeds 32 bits: %d" +msgstr "dato overskrider 32 bit: %d" + +#, python-format +msgid "impossible time zone offset: %d" +msgstr "umuligt tidszone: %d" + +#, python-format +msgid "invalid day spec: %s" +msgstr "" + +#, python-format +msgid "%.0f GB" +msgstr "%.0f GB" + +#, python-format +msgid "%.1f GB" +msgstr "%.1f GB" + +#, python-format +msgid "%.2f GB" +msgstr "%.2f GB" + +#, python-format +msgid "%.0f MB" +msgstr "%.0f MB" + +#, python-format +msgid "%.1f MB" +msgstr "%.1f MB" + +#, python-format +msgid "%.2f MB" +msgstr "%.2f MB" + +#, python-format +msgid "%.0f KB" +msgstr "%.0f KB" + +#, python-format +msgid "%.1f KB" +msgstr "%.1f KB" + +#, python-format +msgid "%.2f KB" +msgstr "%.2f KB" + +#, python-format +msgid "%.0f bytes" +msgstr "%.0f byte" + +msgid "cannot verify bundle or remote repos" +msgstr "" + +msgid "interrupted" +msgstr "afbrudt" + +#, python-format +msgid "empty or missing %s" +msgstr "tom eller mangler %s" + +#, python-format +msgid "data length off by %d bytes" +msgstr "" + +#, python-format +msgid "index contains %d extra bytes" +msgstr "indekset indeholder %d ekstra bytes" + +#, python-format +msgid "warning: `%s' uses revlog format 1" +msgstr "advarsel: '%s' bruger revlog format 1" + +#, python-format +msgid "warning: `%s' uses revlog format 0" +msgstr "advarsel: '%s' bruger revlog format 0" + +#, python-format +msgid "rev %d point to %s changeset %d" +msgstr "" + +#, python-format +msgid " (expected %s)" +msgstr " (forventede %s)" + +#, python-format +msgid "unknown parent 1 %s of %s" +msgstr "ukendt forældre 1 %s til %s" + +#, python-format +msgid "unknown parent 2 %s of %s" +msgstr "ukendt forældre 2 %s til %s" + +#, python-format +msgid "checking parents of %s" +msgstr "tjekkre forældrene til %s" + +#, python-format +msgid "duplicate revision %d (%d)" +msgstr "duplikeret revision %d (%d)" + +#, python-format +msgid "repository uses revlog format %d\n" +msgstr "arkivet bruger revlog format %d\n" + +msgid "checking changesets\n" +msgstr "tjekker ændringer\n" + +#, python-format +msgid "unpacking changeset %s" +msgstr "udpakker ændring %s" + +msgid "checking manifests\n" +msgstr "" + +msgid "file without name in manifest" +msgstr "" + +#, python-format +msgid "reading manifest delta %s" +msgstr "" + +msgid "crosschecking files in changesets and manifests\n" +msgstr "" + +#, python-format +msgid "changeset refers to unknown manifest %s" +msgstr "" + +msgid "in changeset but not in manifest" +msgstr "" + +msgid "in manifest but not in changeset" +msgstr "" + +msgid "checking files\n" +msgstr "tjekker filer\n" + +#, python-format +msgid "cannot decode filename '%s'" +msgstr "kan ikke dekode filnavn '%s'" + +msgid "missing revlog!" +msgstr "manglende revlog!" + +#, python-format +msgid "%s not in manifests" +msgstr "" + +#, python-format +msgid "unpacked size is %s, %s expected" +msgstr "udpakket størrelse er %s, forventede %s" + +#, python-format +msgid "unpacking %s" +msgstr "udpakker %s" + +#, python-format +msgid "empty or missing copy source revlog %s:%s" +msgstr "" + +#, python-format +msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgstr "" + +#, python-format +msgid "checking rename of %s" +msgstr "tjekker omdøbning af %s" + +#, python-format +msgid "%s in manifests not found" +msgstr "" + +#, python-format +msgid "warning: orphan revlog '%s'" +msgstr "advarsel: forældreløs revlog '%s'" + +#, python-format +msgid "%d files, %d changesets, %d total revisions\n" +msgstr "%d filer, %d ændringer, ialt %d revisioner\n" + +#, python-format +msgid "%d warnings encountered!\n" +msgstr "mødte %d advarsler!\n" + +#, python-format +msgid "%d integrity errors encountered!\n" +msgstr "fandt %d integritetsfejl!\n" + +#, python-format +msgid "(first damaged changeset appears to be %d)\n" +msgstr "(første beskadigede ændring er tilsyneladende %d)\n"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/i18n/it.po Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,8676 @@ +# Copyright (C) YEAR ORGANIZATION +# +# Stefano Tortarolo, 2009. +msgid "" +msgstr "" +"Project-Id-Version: Mercurial\n" +"POT-Creation-Date: 2009-01-17 13:56+CET\n" +"PO-Revision-Date: 2009-02-12 18:15+0100\n" +"Last-Translator: Stefano Tortarolo\n" +"Language-Team: Italian <Italian>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 0.3\n" + +msgid "return tuple of (match function, list enabled)." +msgstr "restituisce una tupla di (funzione match, elenco abilitato)." + +msgid "acl: %s not enabled\n" +msgstr "acl: %s non abilitato\n" + +msgid "acl: %s enabled, %d entries for user %s\n" +msgstr "acl: %s abilitato, %d entry per l'utente %s\n" + +msgid "config error - hook type \"%s\" cannot stop incoming changesets" +msgstr "" +"errore di configurazione - l'hook di tipo \"%s\" non pu fermare i changeset " +"in entrata" + +msgid "acl: changes have source \"%s\" - skipping\n" +msgstr "acl: le modifiche hanno sorgente \"%s\" - saltato\n" + +msgid "acl: user %s denied on %s\n" +msgstr "acl: utente %s bloccato su %s\n" + +msgid "acl: access denied for changeset %s" +msgstr "acl: accesso negato per il changeset %s" + +msgid "acl: user %s not allowed on %s\n" +msgstr "acl: l'utente %s non pu avere accesso a %s\n" + +msgid "acl: allowing changeset %s\n" +msgstr "acl: consentendo il changeset %s\n" + +msgid "" +"allow user-defined command aliases\n" +"\n" +"To use, create entries in your hgrc of the form\n" +"\n" +"[alias]\n" +"mycmd = cmd --args\n" +msgstr "" +"consente alias definiti dall'utente\n" +"\n" +"Per usarlo, crea entry nel tuo hgrc della forma\n" +"\n" +"[alias]\n" +"mycmd = cmd --args\n" + +msgid "" +"defer command lookup until needed, so that extensions loaded\n" +" after alias can be aliased" +msgstr "" +"ritarda la ricerca del comando fin quando necessario, in modo che si " +"attivino gli alias\n" +" per le estensioni caricate dopo alias" + +msgid "*** [alias] %s: command %s is unknown" +msgstr "*** [alias] %s: il comando %s sconosciuto" + +msgid "*** [alias] %s: command %s is ambiguous" +msgstr "*** [alias] %s: il comando %s ambiguo" + +msgid "*** [alias] %s: circular dependency on %s" +msgstr "*** [alias] %s: dipendenza circolare su %s" + +msgid "*** [alias] %s: no definition\n" +msgstr "*** [alias] %s: nessuna definizione\n" + +msgid "" +"mercurial bookmarks\n" +"\n" +"Mercurial bookmarks are local moveable pointers to changesets. Every\n" +"bookmark points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it, the\n" +"bookmark is forwarded to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup (e.g. hg\n" +"merge, hg update).\n" +"\n" +"The bookmark extension offers the possiblity to have a more git-like " +"experience\n" +"by adding the following configuration option to your .hgrc:\n" +"\n" +"[bookmarks]\n" +"track.current = True\n" +"\n" +"This will cause bookmarks to track the bookmark that you are currently on, " +"and\n" +"just updates it. This is similar to git's approach of branching.\n" +msgstr "" +"mercurial bookmarks\n" +"\n" +"I segnalibri di Mercurial sono puntatori locali e mobili a changeset. Ogni\n" +"segnalibro punta ad un changeset identificato dal proprio hash. Se fai il " +"commit di un\n" +"changeset basato su un changeset che ha un segnalibro, \n" +"il segnalibro spostato sul nuovo changeset\n" +"\n" +"E' possibile usare nomi di segnalibri in ogni ricerca di revisioni (es. hg\n" +"merge, hg update).\n" +"\n" +"L'estensione bookmark offre la possibilit di avere un'esperienza pi simile a " +"git\n" +"aggiungendo la seguente opzione di configurazione al tuo .hgrc:\n" +"\n" +"[bookmarks]\n" +"track.current = True\n" +"\n" +"Questo porter i segnalibri a tener traccia del segnalibro su cui sei " +"attualmente,e\n" +"ad aggiornarlo. Questo simile all'approccio di branching di git.\n" + +msgid "" +"Parse .hg/bookmarks file and return a dictionary\n" +"\n" +" Bookmarks are stored as {HASH}\\s{NAME}\n" +" (localtags format) values\n" +" in the .hg/bookmarks file. They are read by the parse() method and\n" +" returned as a dictionary with name => hash values.\n" +"\n" +" The parsed dictionary is cached until a write() operation is done.\n" +" " +msgstr "" +"Parsifica il file .hg/bookmarks e restituisce un dizionario\n" +"\n" +" I segnalibri sono memorizzati nel file .hg/bookmarks come \n" +" valori {HASH}\\s{NAME} (formato di localtags).\n" +" Sono letti dal metodo parse() e\n" +" restituiti come dizionario con nome => valore di hash.\n" +"\n" +" Il dizionario parsificato memorizzato in cache finchè un'operazione di " +"write() non viene eseguita.\n" +" " + +msgid "" +"Write bookmarks\n" +"\n" +" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" +" in a format equal to those of localtags.\n" +"\n" +" We also store a backup of the previous state in undo.bookmarks that\n" +" can be copied back on rollback.\n" +" " +msgstr "" + +msgid "" +"Get the current bookmark\n" +"\n" +" If we use gittishsh branches we have a current bookmark that\n" +" we are on. This function returns the name of the bookmark. It\n" +" is stored in .hg/bookmarks.current\n" +" " +msgstr "" +"Ottiene il segnalibro corrente\n" +"\n" +" Se si usano branch in stile git si ha un segnalibro corrente\n" +" attivo. Questa funzione restituisce il nome del segnalibro. Questi\n" +" è memorizzato in .hg/bookmarks.current\n" +" " + +msgid "" +"Set the name of the bookmark that we are currently on\n" +"\n" +" Set the name of the bookmark that we are on (hg update <bookmark>).\n" +" The name is recorded in .hg/bookmarks.current\n" +" " +msgstr "" +"Imposta il nome del segnalibro sul quale ci si trova attualmente\n" +"\n" +" Imposta il nome del segnalibro sul quale ci si trova(hg update " +"<bookmark>).\n" +" Il nome viene memorizzato in .hg/bookmarks.current\n" +" " + +msgid "" +"mercurial bookmarks\n" +"\n" +" Bookmarks are pointers to certain commits that move when\n" +" commiting. Bookmarks are local. They can be renamed, copied and\n" +" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n" +" update' to update to a given bookmark.\n" +"\n" +" You can use 'hg bookmark NAME' to set a bookmark on the current\n" +" tip with the given name. If you specify a revision using -r REV\n" +" (where REV may be an existing bookmark), the bookmark is set to\n" +" that revision.\n" +" " +msgstr "" + +msgid "a bookmark of this name does not exist" +msgstr "non esiste un segnalibro con questo nome" + +msgid "a bookmark of the same name already exists" +msgstr "esiste gi un segnalibro con lo stesso nome" + +msgid "new bookmark name required" +msgstr "richiesto nuovo nome per il segnalibro" + +msgid "bookmark name required" +msgstr "richiesto nome per il segnalibro" + +msgid "bookmark name cannot contain newlines" +msgstr "il nome di un segnalibro non pu contenere a capo" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "un segnalibro non pu avere lo stesso nome di una branch esistente" + +msgid "" +"Strip bookmarks if revisions are stripped using\n" +" the mercurial.strip method. This usually happens during\n" +" qpush and qpop" +msgstr "" + +msgid "" +"Add a revision to the repository and\n" +" move the bookmark" +msgstr "" +"Aggiunge una revisione al repository e\n" +" sposta il segnalibro" + +msgid "Merge bookmarks with normal tags" +msgstr "Fa il merge dei segnalibri con tag normali" + +msgid "" +"Set the current bookmark\n" +"\n" +" If the user updates to a bookmark we update the .hg/bookmarks.current\n" +" file.\n" +" " +msgstr "" + +msgid "force" +msgstr "" + +msgid "revision" +msgstr "" + +msgid "delete a given bookmark" +msgstr "" + +msgid "rename a given bookmark" +msgstr "" + +msgid "hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]" +msgstr "" + +msgid "" +"Bugzilla integration\n" +"\n" +"This hook extension adds comments on bugs in Bugzilla when changesets\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n" +"status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla " +"installations\n" +"using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification " +"emails.\n" +"That script changes between Bugzilla versions; the 'processmail' script " +"used\n" +"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" +"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " +"user\n" +"pushing the change; you will need to ensure the Bugzilla install file\n" +"permissions are set appropriately.\n" +"\n" +"Configuring the extension:\n" +"\n" +" [bugzilla]\n" +" host Hostname of the MySQL server holding the Bugzilla database.\n" +" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +" user Username to use to access MySQL server. Default 'bugs'.\n" +" password Password to use to access MySQL server.\n" +" timeout Database connection timeout (seconds). Default 5.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 " +"and\n" +" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" +" versions prior to 2.18.\n" +" bzuser Fallback Bugzilla user name to record comments with, if\n" +" changeset committer cannot be found as a Bugzilla user.\n" +" bzdir Bugzilla install directory. Used by default notify.\n" +" Default '/var/www/html/bugzilla'.\n" +" notify The command to run to get Bugzilla to send bug change\n" +" notification emails. Substitutes from a map with 3 keys,\n" +" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla " +"email).\n" +" Default depends on version; from 2.18 it is\n" +" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" +"(user)s\".\n" +" regexp Regular expression to match bug IDs in changeset commit " +"message.\n" +" Must contain one \"()\" group. The default expression " +"matches\n" +" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" +" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " +"thereof.\n" +" Matching is case insensitive.\n" +" style The style file to use when formatting comments.\n" +" template Template to use when formatting comments. Overrides\n" +" style if specified. In addition to the usual Mercurial\n" +" keywords, the extension specifies:\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial " +"repository.\n" +" {webroot} Stripped pathname of the Mercurial " +"repository.\n" +" {hgweb} Base URL for browsing Mercurial " +"repositories.\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +" strip The number of slashes to strip from the front of {root}\n" +" to produce {webroot}. Default 0.\n" +" usermap Path of file containing Mercurial committer ID to Bugzilla " +"user\n" +" ID mappings. If specified, the file should contain one " +"mapping\n" +" per line, \"committer\"=\"Bugzilla user\". See also the\n" +" [usermap] section.\n" +"\n" +" [usermap]\n" +" Any entries in this section specify mappings of Mercurial committer ID\n" +" to Bugzilla user ID. See also [bugzilla].usermap.\n" +" \"committer\"=\"Bugzilla user\"\n" +"\n" +" [web]\n" +" baseurl Base URL for browsing Mercurial repositories. Reference from\n" +" templates as {hgweb}.\n" +"\n" +"Activating the extension:\n" +"\n" +" [extensions]\n" +" hgext.bugzilla =\n" +"\n" +" [hooks]\n" +" # run bugzilla hook on every change pulled or pushed in here\n" +" incoming.bugzilla = python:hgext.bugzilla.hook\n" +"\n" +"Example configuration:\n" +"\n" +"This example configuration is for a collection of Mercurial repositories\n" +"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" +"/opt/bugzilla-3.2.\n" +"\n" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" +"rev/{node|short}\\n\\n{desc}\\n\n" +" strip=5\n" +"\n" +" [web]\n" +" baseurl=http://dev.domain.com/hg\n" +"\n" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com\n" +"\n" +"Commits add a comment to the Bugzilla bug record of the form:\n" +"\n" +" Changeset 3b16791d6642 in repository-name.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" +"\n" +" Changeset commit comment. Bug 1234.\n" +msgstr "" + +msgid "support for bugzilla version 2.16." +msgstr "" + +msgid "connecting to %s:%s as %s, password %s\n" +msgstr "" + +msgid "run a query." +msgstr "" + +msgid "query: %s %s\n" +msgstr "" + +msgid "failed query: %s %s\n" +msgstr "" + +msgid "get identity of longdesc field" +msgstr "" + +msgid "unknown database schema" +msgstr "" + +msgid "filter not-existing bug ids from list." +msgstr "" + +msgid "filter bug ids from list that already refer to this changeset." +msgstr "" + +msgid "bug %d already knows about changeset %s\n" +msgstr "il bug %d gi a conoscenza del changeset %s\n" + +msgid "tell bugzilla to send mail." +msgstr "dice a bugzilla di inviare la mail." + +msgid "telling bugzilla to send mail:\n" +msgstr "sto dicendo a bugzilla di inviare la mail:\n" + +msgid " bug %s\n" +msgstr " bug %s\n" + +msgid "running notify command %s\n" +msgstr "sto eseguendo il comando di notifica %s\n" + +msgid "bugzilla notify command %s" +msgstr "comando di notifica di bugzilla %s" + +msgid "done\n" +msgstr "fatto\n" + +msgid "look up numeric bugzilla user id." +msgstr "" + +msgid "looking up user %s\n" +msgstr "ricercando l'utente %s\n" + +msgid "map name of committer to bugzilla user name." +msgstr "" + +msgid "" +"see if committer is a registered bugzilla user. Return\n" +" bugzilla username and userid if so. If not, return default\n" +" bugzilla username and userid." +msgstr "" + +msgid "cannot find bugzilla user id for %s" +msgstr "" + +msgid "cannot find bugzilla user id for %s or %s" +msgstr "" + +msgid "" +"add comment to bug. try adding comment as committer of\n" +" changeset, otherwise as default bugzilla user." +msgstr "" + +msgid "support for bugzilla 2.18 series." +msgstr "" + +msgid "support for bugzilla 3.0 series." +msgstr "" + +msgid "" +"return object that knows how to talk to bugzilla version in\n" +" use." +msgstr "" + +msgid "bugzilla version %s not supported" +msgstr "" + +msgid "" +"find valid bug ids that are referred to in changeset\n" +" comments and that do not already have references to this\n" +" changeset." +msgstr "" + +msgid "update bugzilla bug with reference to changeset." +msgstr "" + +msgid "" +"strip leading prefix of repo root and turn into\n" +" url-safe path." +msgstr "" + +msgid "" +"changeset {node|short} in repo {root} refers to bug {bug}.\n" +"details:\n" +"\t{desc|tabindent}" +msgstr "" + +msgid "" +"add comment to bugzilla for each changeset that refers to a\n" +" bugzilla bug id. only add a comment once per bug, so same change\n" +" seen multiple times does not fill bug with duplicate data." +msgstr "" + +msgid "python mysql support not available: %s" +msgstr "il supporto per python per mysql non è disponibile: %s" + +msgid "hook type %s does not pass a changeset id" +msgstr "" + +msgid "database error: %s" +msgstr "errore del database: %s" + +msgid "" +"show the children of the given or working dir revision\n" +"\n" +" Print the children of the working directory's revisions.\n" +" If a revision is given via --rev, the children of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (after the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" + +msgid "show children of the specified rev" +msgstr "" + +msgid "hg children [-r REV] [FILE]" +msgstr "" + +msgid "command to show certain statistics about revision history" +msgstr "" + +msgid "Calculate stats" +msgstr "" + +msgid "Revision %d is a merge, ignoring...\n" +msgstr "" + +msgid "\rgenerating stats: %d%%" +msgstr "" + +msgid "" +"graph count of revisions grouped by template\n" +"\n" +" Will graph count of changed lines or revisions grouped by template or\n" +" alternatively by date, if dateformat is used. In this case it will " +"override\n" +" template.\n" +"\n" +" By default statistics are counted for number of changed lines.\n" +"\n" +" Examples:\n" +"\n" +" # display count of changed lines for every committer\n" +" hg churn -t '{author|email}'\n" +"\n" +" # display daily activity graph\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # display activity of developers by month\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # display count of lines changed in every year\n" +" hg churn -f '%Y' -s\n" +"\n" +" The map file format used to specify aliases is fairly simple:\n" +"\n" +" <alias email> <actual email>" +msgstr "" + +msgid "assuming %i character terminal\n" +msgstr "" + +msgid "count rate for the specified revision or range" +msgstr "" + +msgid "count rate for revs matching date spec" +msgstr "" + +msgid "template to group changesets" +msgstr "" + +msgid "strftime-compatible format for grouping by date" +msgstr "" + +msgid "count rate by number of changesets" +msgstr "" + +msgid "sort by key (default: sort by count)" +msgstr "" + +msgid "file with email aliases" +msgstr "" + +msgid "show progress" +msgstr "" + +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" +msgstr "" + +msgid "" +"add color output to status, qseries, and diff-related commands\n" +"\n" +"This extension modifies the status command to add color to its output to\n" +"reflect file status, the qseries command to add color to reflect patch " +"status\n" +"(applied, unapplied, missing), and to diff-related commands to highlight\n" +"additions, removals, diff headers, and trailing whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are also\n" +"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" +"ANSI escape codes). This module also provides the render_text function,\n" +"which can be used to add effects to any text.\n" +"\n" +"To enable this extension, add this to your .hgrc file:\n" +"[extensions]\n" +"color =\n" +"\n" +"Default effects my be overriden from the .hgrc file:\n" +"\n" +"[color]\n" +"status.modified = blue bold underline red_background\n" +"status.added = green bold\n" +"status.removed = red bold blue_background\n" +"status.deleted = cyan bold underline\n" +"status.unknown = magenta bold underline\n" +"status.ignored = black bold\n" +"\n" +"# 'none' turns off all effects\n" +"status.clean = none\n" +"status.copied = none\n" +"\n" +"qseries.applied = blue bold underline\n" +"qseries.unapplied = black bold\n" +"qseries.missing = red bold\n" +"\n" +"diff.diffline = bold\n" +"diff.extended = cyan bold\n" +"diff.file_a = red bold\n" +"diff.file_b = green bold\n" +"diff.hunk = magenta\n" +"diff.deleted = red\n" +"diff.inserted = green\n" +"diff.changed = white\n" +"diff.trailingwhitespace = bold red_background\n" +msgstr "" + +msgid "Wrap text in commands to turn on each effect." +msgstr "" + +msgid "run the status command with colored output" +msgstr "" + +msgid "run the qseries command with colored output" +msgstr "" + +msgid "wrap ui.write for colored diff output" +msgstr "" + +msgid "wrap cmdutil.changeset_printer.showpatch with colored output" +msgstr "" + +msgid "run the diff command with colored output" +msgstr "esegue il comando diff con output colorato" + +msgid "Initialize the extension." +msgstr "Inizializza l'estensione." + +msgid "patch in command to command table and load effect map" +msgstr "" + +msgid "when to colorize (always, auto, or never)" +msgstr "quando colorare (sempre, auto o mai)" + +msgid "don't colorize output" +msgstr "non colorare l'output" + +msgid "converting foreign VCS repositories to Mercurial" +msgstr "converte repository di altri VCS in Mercurial" + +msgid "" +"convert a foreign SCM repository to a Mercurial one.\n" +"\n" +" Accepted source formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - CVS [cvs]\n" +" - Darcs [darcs]\n" +" - git [git]\n" +" - Subversion [svn]\n" +" - Monotone [mtn]\n" +" - GNU Arch [gnuarch]\n" +" - Bazaar [bzr]\n" +"\n" +" Accepted destination formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - Subversion [svn] (history on branches is not preserved)\n" +"\n" +" If no revision is given, all revisions will be converted. Otherwise,\n" +" convert will only import up to the named revision (given in a format\n" +" understood by the source).\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source with '-hg' appended. If the destination\n" +" repository doesn't exist, it will be created.\n" +"\n" +" If <REVMAP> isn't given, it will be put in a default location\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" +" file that maps each source commit ID to the destination ID for\n" +" that revision, like so:\n" +" <source ID> <destination ID>\n" +"\n" +" If the file doesn't exist, it's automatically created. It's updated\n" +" on each commit copied, so convert-repo can be interrupted and can\n" +" be run repeatedly to copy new commits.\n" +"\n" +" The [username mapping] file is a simple text file that maps each source\n" +" commit author to a destination commit author. It is handy for source " +"SCMs\n" +" that use unix logins to identify authors (eg: CVS). One line per author\n" +" mapping and the line format is:\n" +" srcauthor=whatever string you want\n" +"\n" +" The filemap is a file that allows filtering and remapping of files\n" +" and directories. Comment lines start with '#'. Each line can\n" +" contain one of the following directives:\n" +"\n" +" include path/to/file\n" +"\n" +" exclude path/to/file\n" +"\n" +" rename from/file to/file\n" +"\n" +" The 'include' directive causes a file, or all files under a\n" +" directory, to be included in the destination repository, and the\n" +" exclusion of all other files and dirs not explicitely included.\n" +" The 'exclude' directive causes files or directories to be omitted.\n" +" The 'rename' directive renames a file or directory. To rename from a\n" +" subdirectory into the root of the repository, use '.' as the path to\n" +" rename to.\n" +"\n" +" The splicemap is a file that allows insertion of synthetic\n" +" history, letting you specify the parents of a revision. This is\n" +" useful if you want to e.g. give a Subversion merge two parents, or\n" +" graft two disconnected series of history together. Each entry\n" +" contains a key, followed by a space, followed by one or two\n" +" values, separated by spaces. The key is the revision ID in the\n" +" source revision control system whose parents should be modified\n" +" (same format as a key in .hg/shamap). The values are the revision\n" +" IDs (in either the source or destination revision control system)\n" +" that should be used as the new parents for that node.\n" +"\n" +" Mercurial Source\n" +" -----------------\n" +"\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" +" ignore integrity errors when reading. Use it to fix Mercurial\n" +" repositories with missing revlogs, by converting from and to\n" +" Mercurial.\n" +" --config convert.hg.saverev=True (boolean)\n" +" allow target to preserve source revision ID\n" +" --config convert.hg.startrev=0 (hg revision identifier)\n" +" convert start revision and its descendants\n" +"\n" +" CVS Source\n" +" ----------\n" +"\n" +" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" +" to indicate the starting point of what will be converted. Direct\n" +" access to the repository files is not needed, unless of course\n" +" the repository is :local:. The conversion uses the top level\n" +" directory in the sandbox to find the CVS repository, and then uses\n" +" CVS rlog commands to find files to convert. This means that unless\n" +" a filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganisation in the CVS\n" +" sandbox is ignored.\n" +"\n" +" Because CVS does not have changesets, it is necessary to collect\n" +" individual commits to CVS and merge them into changesets. CVS\n" +" source uses its internal changeset merging code by default but can\n" +" be configured to call the external 'cvsps' program by setting:\n" +" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +" This is a legacy option and may be removed in future.\n" +"\n" +" The options shown are the defaults.\n" +"\n" +" Internal cvsps is selected by setting\n" +" --config convert.cvsps=builtin\n" +" and has a few more configurable options:\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed between\n" +" commits with identical user and log message in a single\n" +" changeset. When very large files were checked in as part\n" +" of a changeset then the default may not be long enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" insert a dummy revision merging the branch on which this log\n" +" message occurs to the branch indicated in the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" add the most recent revision on the branch indicated in the\n" +" regex as the second parent of the changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" +" merging code to be run without doing a conversion. Its parameters and\n" +" output are similar to that of cvsps 2.1.\n" +"\n" +" Subversion Source\n" +" -----------------\n" +"\n" +" Subversion source detects classical trunk/branches/tags layouts.\n" +" By default, the supplied \"svn://repo/path/\" source URL is\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists\n" +" it replaces the default branch. If \"svn://repo/path/branches\"\n" +" exists, its subdirectories are listed as possible branches. If\n" +" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" +" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" +" can be overriden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable\n" +" autodetection.\n" +"\n" +" --config convert.svn.branches=branches (directory name)\n" +" specify the directory containing branches\n" +" --config convert.svn.tags=tags (directory name)\n" +" specify the directory containing tags\n" +" --config convert.svn.trunk=trunk (directory name)\n" +" specify the name of the trunk branch\n" +"\n" +" Source history can be retrieved starting at a specific revision,\n" +" instead of being integrally converted. Only single branch\n" +" conversions are supported.\n" +"\n" +" --config convert.svn.startrev=0 (svn revision number)\n" +" specify start Subversion revision.\n" +"\n" +" Mercurial Destination\n" +" ---------------------\n" +"\n" +" --config convert.hg.clonebranches=False (boolean)\n" +" dispatch source branches in separate clones.\n" +" --config convert.hg.tagsbranch=default (branch name)\n" +" tag revisions branch name\n" +" --config convert.hg.usebranchnames=True (boolean)\n" +" preserve branch names\n" +"\n" +" " +msgstr "" + +msgid "" +"create changeset information from CVS\n" +"\n" +" This command is intended as a debugging tool for the CVS to Mercurial\n" +" converter, and can be used as a direct replacement for cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" +" directory) in the CVS repository, and converts the log to a series of\n" +" changesets based on matching commit log entries and dates." +msgstr "" + +msgid "username mapping filename" +msgstr "nome del file con il mapping degli username" + +msgid "destination repository type" +msgstr "tipo di repository di destinazione" + +msgid "remap file names using contents of file" +msgstr "rimappa i nomi dei file usando il contenuto dei file" + +msgid "import up to target revision REV" +msgstr "importa fino alla revisione target REV" + +msgid "source repository type" +msgstr "tipo del repository sorgente" + +msgid "splice synthesized history into place" +msgstr "" + +msgid "try to sort changesets by date" +msgstr "prova ad ordinare i changeset per data" + +msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" +msgstr "hg convert [OPZIONI]... SORGENTE [DEST [REVMAP]]" + +msgid "only return changes on specified branches" +msgstr "restituisce solo le modifiche relative alle branch specificate" + +msgid "prefix to remove from file names" +msgstr "prefisso da rimuovere dai nomi dei file" + +msgid "only return changes after or between specified tags" +msgstr "restituisce solo le modifiche dopo o tra le tag specificate" + +msgid "update cvs log cache" +msgstr "aggiorna la cache dei log di cvs" + +msgid "create new cvs log cache" +msgstr "crea una nuova cache dei log cvs" + +msgid "set commit time fuzz in seconds" +msgstr "" + +msgid "specify cvsroot" +msgstr "specifica cvsroot" + +msgid "show parent changesets" +msgstr "mostra i changeset genitori" + +msgid "show current changeset in ancestor branches" +msgstr "mostra il changeset corrente nei rami degli antenati" + +msgid "" +"\n" +"The `extdiff' Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working dir. The external diff\n" +"programs are called with a configurable set of options and two\n" +"non-option arguments: paths to directories containing snapshots of\n" +"files to compare.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.extdiff =\n" +"\n" +"The `extdiff' extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"\n" +" [extdiff]\n" +" # add new command that runs GNU diff(1) in 'context diff' mode\n" +" cdiff = gdiff -Nprc5\n" +" ## or the old way:\n" +" #cmd.cdiff = gdiff\n" +" #opts.cdiff = -Nprc5\n" +"\n" +" # add new command called vdiff, runs kdiff3\n" +" vdiff = kdiff3\n" +"\n" +" # add new command called meld, runs meld (no need to name twice)\n" +" meld =\n" +"\n" +" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" +" #(see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " +"in\n" +" # your .vimrc\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" +"\n" +"You can use -I/-X and list of file or directory names like normal\n" +"\"hg diff\" command. The `extdiff' extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" +msgstr "" + +msgid "snapshot files as of some revision" +msgstr "" + +msgid "making snapshot of %d files from rev %s\n" +msgstr "" + +msgid "" +"snapshot files from working directory.\n" +" if not using snapshot, -I/-X does not work and recursive diff\n" +" in tools like kdiff3 and meld displays too many files." +msgstr "" + +msgid "making snapshot of %d files from working dir\n" +msgstr "" + +msgid "" +"Do the actuall diff:\n" +"\n" +" - copy to a temp structure if diffing 2 internal revisions\n" +" - copy to a temp structure if diffing working revision with\n" +" another one and more than 1 file is changed\n" +" - just invoke the diff for a single file in the working dir\n" +" " +msgstr "" + +msgid "running %r in %s\n" +msgstr "" + +msgid "file changed while diffing. Overwriting: %s (src: %s)\n" +msgstr "" + +msgid "cleaning up temp directory\n" +msgstr "sto ripulendo la directory temporanea\n" + +msgid "" +"use external program to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using\n" +" an external program. The default program used is diff, with\n" +" default options \"-Npru\".\n" +"\n" +" To select a different program, use the -p option. The program\n" +" will be passed the names of two directories to compare. To pass\n" +" additional options to the program, use the -o option. These will\n" +" be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are\n" +" shown between those revisions. If only one revision is\n" +" specified then that revision is compared to the working\n" +" directory, and, when no revisions are specified, the\n" +" working directory files are compared to its parent." +msgstr "" + +msgid "comparison program to run" +msgstr "" + +msgid "pass option to comparison program" +msgstr "" + +msgid "hg extdiff [OPT]... [FILE]..." +msgstr "" + +msgid "use closure to save diff command to use" +msgstr "" + +msgid "hg %s [OPTION]... [FILE]..." +msgstr "hg %s [OPZIONI]... [FILE]..." + +msgid "pulling, updating and merging in one command" +msgstr "" + +msgid "" +"pull changes from a remote repository, merge new changes if needed.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository.\n" +"\n" +" If the pulled changes add a new branch head, the head is automatically\n" +" merged, and the result of the merge is committed. Otherwise, the\n" +" working directory is updated to include the new changes.\n" +"\n" +" When a merge occurs, the newly pulled changes are assumed to be\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" +" order, use --switch-parent.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"effettua il pull delle modifiche da un repository remoto, effettua il merge " +"delle nuove modifiche se necessario.\n" +"\n" +" Questo trova tutte le modifiche dal repository al percorso o URL " +"specificato\n" +" e le aggiunge al repository locale.\n" +"\n" +" Se le modifiche ottenute aggiungono una nuova head, il merge di questa " +"viene effettuato\n" +" automaticamente e si effettua il commit del merge. Altrimenti, la\n" +" directory di lavoro viene aggiornata per includere le nuove modifiche.\n" +"\n" +" Quando si verifica un merge, si assume che le modifiche appena ottenute " +"siano\n" +" \"autoritarie\". La head delle nuove modifiche è usata come primo\n" +" genitore, con le modifiche locali come secondo. Per invertire l'ordine\n" +" di merge, usare --switch-parent.\n" +"\n" +" Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n" +" " + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" + +msgid "outstanding uncommitted merge" +msgstr "c'è un merge in sospeso di cui non si è effettuato il commit" + +msgid "outstanding uncommitted changes" +msgstr "ci sono modifiche in sospeso di cui non si è effettuato il commit" + +msgid "working directory is missing some files" +msgstr "alla directory di lavoro mancano alcuni file" + +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" + +msgid "pulling from %s\n" +msgstr "sto facendo pull da %s\n" + +msgid "fetch -r doesn't work for remote repositories yet" +msgstr "" + +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" +msgstr "" + +msgid "updating to %d:%s\n" +msgstr "sto aggiornando a %d:%s\n" + +msgid "merging with %d:%s\n" +msgstr "sto facendo il merge con %d:%s\n" + +msgid "Automated merge with %s" +msgstr "Merge automatico con %s" + +msgid "new changeset %d:%s merges remote changes with local\n" +msgstr "" +"il nuovo changeset %d:%s fa il merge delle modifiche remote con quelle " +"locali\n" + +msgid "a specific revision you would like to pull" +msgstr "una specifica revisione di cui si desidera fare il pull" + +msgid "edit commit message" +msgstr "modifica il messaggio di commit" + +msgid "edit commit message (DEPRECATED)" +msgstr "modifica il messaggio di commit (DEPRECATO)" + +msgid "switch parents when merging" +msgstr "inverte i genitori durante il merge" + +msgid "hg fetch [SOURCE]" +msgstr "hg fetch [SORGENTE]" + +msgid " returns of the good and bad signatures" +msgstr " restituisce le firme valide e non valide" + +msgid "error while verifying signature" +msgstr "errore durante la verifica della firma" + +msgid "create a new gpg instance" +msgstr "crea una nuova istanza gpg" + +msgid "" +"\n" +" walk over every sigs, yields a couple\n" +" ((node, version, sig), (filename, linenumber))\n" +" " +msgstr "" +"\n" +" percorre ogni firma, restituendo una coppia\n" +" ((nodo, versione, firma), (nome del file, numero di riga))\n" +" " + +msgid "get the keys who signed a data" +msgstr "ottiene le chiavi di chi ha firmato i dati" + +msgid "%s Bad signature from \"%s\"\n" +msgstr "%s Firma non valida da \"%s\"\n" + +msgid "%s Note: Signature has expired (signed by: \"%s\")\n" +msgstr "%s Nota: La firma è scaduta (firmato da: \"%s\")\n" + +msgid "%s Note: This key has expired (signed by: \"%s\")\n" +msgstr "%s Nota: Questa chiave è scaduta (firmato da: \"%s\")\n" + +msgid "list signed changesets" +msgstr "elenca i changeset firmati" + +msgid "%s:%d node does not exist\n" +msgstr "il nodo %s:%d non esiste\n" + +msgid "verify all the signatures there may be for a particular revision" +msgstr "" +"verifica tutte le firme che potrebbero esistere per una particolare revisione" + +msgid "No valid signature for %s\n" +msgstr "Nessuna firma valida per %s\n" + +msgid "associate a string to a key (username, comment)" +msgstr "associa una stringa ad una chiave (username, commento)" + +msgid "" +"add a signature for the current or given revision\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"aggiunge una firma per la revisione corrente o data\n" +"\n" +" Se nessuna revisione è stata specificata, viene usato il genitore\n" +" della directory di lavoro, oppure tip se non si è eseguito il\n" +" checkout di nessuna revisione.\n" +"\n" +" Vedere 'hg help dates' per un elenco dei formati validi per\n" +" -d/--date.\n" +" " + +msgid "uncommitted merge - please provide a specific revision" +msgstr "" +"merge di cui non si è effettuato il commit - si prega di fornire una " +"revisione specifica" + +msgid "Error while signing" +msgstr "Errore durante la firma" + +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" +"la copia di lavoro di .hgsigs è cambiata (si prega di fare il commit " +"manualmente di .hgsigs o usare --force)" + +msgid "Added signature for changeset %s" +msgstr "Aggiunta firma per il changeset %s" + +msgid "map a manifest into some text" +msgstr "associa un manifesto ad un qualche testo" + +msgid "unknown signature version" +msgstr "versione della firma sconosciuta" + +msgid "make the signature local" +msgstr "rende la firma locale" + +msgid "sign even if the sigfile is modified" +msgstr "firma anche se il sigfile è stato modificato" + +msgid "do not commit the sigfile after signing" +msgstr "non effettuare il commit del sigfile dopo la firma" + +msgid "the key id to sign with" +msgstr "l'id della chiave con cui firmare" + +msgid "commit message" +msgstr "messaggio di commit" + +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "hg sign [OPZIONI]... [REVISIONE]..." + +msgid "hg sigcheck REVISION" +msgstr "hg sigcheck REVISIONE" + +msgid "hg sigs" +msgstr "hg sigs" + +msgid "" +"show revision graphs in terminal windows\n" +"\n" +"This extension adds a --graph option to the incoming, outgoing and log\n" +"commands. When this options is given, an ascii representation of the\n" +"revision graph is also shown.\n" +msgstr "" + +msgid "" +"cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history from " +"revision\n" +" start to revision stop (which must be less than or equal to start).\n" +" " +msgstr "" + +msgid "" +"file cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history of a single\n" +" file from revision start to revision stop (which must be less than or\n" +" equal to start).\n" +" " +msgstr "" + +msgid "" +"grapher for asciigraph on a list of nodes and their parents\n" +"\n" +" nodes must generate tuples (node, parents, char, lines) where\n" +" - parents must generate the parents of node, in sorted order,\n" +" and max length 2,\n" +" - char is the char to print as the node symbol, and\n" +" - lines are the lines to display next to the node.\n" +" " +msgstr "" + +msgid "" +"prints an ASCII graph of the DAG returned by the grapher\n" +"\n" +" grapher is a generator that emits tuples with the following elements:\n" +"\n" +" - Character to use as node's symbol.\n" +" - List of lines to display as the node's text.\n" +" - Column of the current node in the set of ongoing edges.\n" +" - Edges; a list of (col, next_col) indicating the edges between\n" +" the current node and its parents.\n" +" - Number of columns (ongoing edges) in the current revision.\n" +" - The difference between the number of columns (ongoing edges)\n" +" in the next revision and the number of columns (ongoing edges)\n" +" in the current revision. That is: -1 means one column removed;\n" +" 0 means no columns added or removed; 1 means one column added.\n" +" " +msgstr "" + +msgid "limit must be a positive integer" +msgstr "" + +msgid "limit must be positive" +msgstr "" + +msgid "--graph option is incompatible with --%s" +msgstr "l'opzione --graph è incompatibile con --%s" + +msgid "" +"show revision history alongside an ASCII revision graph\n" +"\n" +" Print a revision history alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "" +"cset DAG generator yielding (node, [parents]) tuples\n" +"\n" +" This generator function walks through the revisions not found\n" +" in the destination\n" +" " +msgstr "" + +msgid "comparing with %s\n" +msgstr "" + +msgid "no changes found\n" +msgstr "" + +msgid "" +"show the outgoing changesets alongside an ASCII revision graph\n" +"\n" +" Print the outgoing changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "" +"cset DAG generator yielding (node, [parents]) tuples\n" +"\n" +" This generator function walks through the revisions of the destination\n" +" not found in repo\n" +" " +msgstr "" + +msgid "" +"show the incoming changesets alongside an ASCII revision graph\n" +"\n" +" Print the incoming changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "wrap the command" +msgstr "" + +msgid "show the revision DAG" +msgstr "" + +msgid "limit number of changes displayed" +msgstr "" + +msgid "show patch" +msgstr "mostra patch" + +msgid "show the specified revision or range" +msgstr "" + +msgid "hg glog [OPTION]... [FILE]" +msgstr "hg glog [OPZIONI]... [FILE]" + +msgid "" +"CIA notification\n" +"\n" +"This is meant to be run as a changegroup or incoming hook.\n" +"To configure it, set the following options in your hgrc:\n" +"\n" +"[cia]\n" +"# your registered CIA user name\n" +"user = foo\n" +"# the name of the project in CIA\n" +"project = foo\n" +"# the module (subproject) (optional)\n" +"#module = foo\n" +"# Append a diffstat to the log message (optional)\n" +"#diffstat = False\n" +"# Template to use for log messages (optional)\n" +"#template = {desc}\n" +"{baseurl}/rev/{node}-- {diffstat}\n" +"# Style to use (optional)\n" +"#style = foo\n" +"# The URL of the CIA notification service (optional)\n" +"# You can use mailto: URLs to send by email, eg\n" +"# mailto:cia@cia.vc\n" +"# Make sure to set email.from if you do this.\n" +"#url = http://cia.vc/\n" +"# print message instead of sending it (optional)\n" +"#test = False\n" +"\n" +"[hooks]\n" +"# one of these:\n" +"changegroup.cia = python:hgcia.hook\n" +"#incoming.cia = python:hgcia.hook\n" +"\n" +"[web]\n" +"# If you want hyperlinks (optional)\n" +"baseurl = http://server/path/to/repo\n" +msgstr "" + +msgid " A CIA message " +msgstr "" + +msgid " CIA notification class " +msgstr "" + +msgid "hgcia: sending update to %s\n" +msgstr "" + +msgid " send CIA notification " +msgstr "" + +msgid "email.from must be defined when sending by email" +msgstr "" + +msgid "cia: no user specified" +msgstr "" + +msgid "cia: no project specified" +msgstr "" + +msgid "" +"browsing the repository in a graphical way\n" +"\n" +"The hgk extension allows browsing the history of a repository in a\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" +"not distributed with Mercurial.)\n" +"\n" +"hgk consists of two parts: a Tcl script that does the displaying and\n" +"querying of information, and an extension to mercurial named hgk.py,\n" +"which provides hooks for hgk to get information. hgk can be found in\n" +"the contrib directory, and hgk.py can be found in the hgext directory.\n" +"\n" +"To load the hgext.py extension, add it to your .hgrc file (you have\n" +"to use your global $HOME/.hgrc file, not one in a repository). You\n" +"can specify an absolute path:\n" +"\n" +" [extensions]\n" +" hgk=/usr/local/lib/hgk.py\n" +"\n" +"Mercurial can also scan the default python library path for a file\n" +"named 'hgk.py' if you set hgk empty:\n" +"\n" +" [extensions]\n" +" hgk=\n" +"\n" +"The hg view command will launch the hgk Tcl script. For this command\n" +"to work, hgk must be in your search path. Alternately, you can\n" +"specify the path to hgk in your .hgrc file:\n" +"\n" +" [hgk]\n" +" path=/location/of/hgk\n" +"\n" +"hgk can make use of the extdiff extension to visualize revisions.\n" +"Assuming you had already configured extdiff vdiff command, just add:\n" +"\n" +" [hgk]\n" +" vdiff=vdiff\n" +"\n" +"Revisions context menu will now display additional entries to fire\n" +"vdiff on hovered and selected revisions." +msgstr "" + +msgid "diff trees from two commits" +msgstr "" + +msgid "output common ancestor information" +msgstr "" + +msgid "cat a specific revision" +msgstr "stampa a video una specifica revisione" + +msgid "cat-file: type or revision not supplied\n" +msgstr "" + +msgid "aborting hg cat-file only understands commits\n" +msgstr "" + +msgid "parse given revisions" +msgstr "" + +msgid "print revisions" +msgstr "" + +msgid "print extension options" +msgstr "stampa le opzioni dell'estensione" + +msgid "start interactive history viewer" +msgstr "" + +msgid "running %s\n" +msgstr "" + +msgid "hg view [-l LIMIT] [REVRANGE]" +msgstr "" + +msgid "generate patch" +msgstr "genera patch" + +msgid "recursive" +msgstr "ricorsivo" + +msgid "pretty" +msgstr "" + +msgid "stdin" +msgstr "stdin" + +msgid "detect copies" +msgstr "rileva copie" + +msgid "search" +msgstr "ricerca" + +msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." +msgstr "hg git-diff-tree [OPZIONI]... NODO1 NODO2 [FILE]..." + +msgid "hg debug-cat-file [OPTION]... TYPE FILE" +msgstr "hg debug-cat-file [OPZIONI]... TIPO FILE" + +msgid "hg debug-config" +msgstr "" + +msgid "hg debug-merge-base node node" +msgstr "" + +msgid "ignored" +msgstr "ignorato" + +msgid "hg debug-rev-parse REV" +msgstr "" + +msgid "header" +msgstr "intestazione" + +msgid "topo-order" +msgstr "ordine topologico" + +msgid "parents" +msgstr "genitori" + +msgid "max-count" +msgstr "conto massimo" + +msgid "hg debug-rev-list [options] revs" +msgstr "hg debug-rev-list [opzioni] revs" + +msgid "" +"syntax highlighting in hgweb, based on Pygments\n" +"\n" +"It depends on the pygments syntax highlighting library:\n" +"http://pygments.org/\n" +"\n" +"To enable the extension add this to hgrc:\n" +"\n" +"[extensions]\n" +"hgext.highlight =\n" +"\n" +"There is a single configuration option:\n" +"\n" +"[web]\n" +"pygments_style = <style>\n" +"\n" +"The default is 'colorful'.\n" +"\n" +"-- Adam Hupp <adam@hupp.org>\n" +msgstr "" + +msgid "inotify-based status acceleration for Linux systems\n" +msgstr "accelerazione di status per sistemi Linux basata su inotify\n" + +msgid "start an inotify server for this repository" +msgstr "" + +msgid "(found dead inotify server socket; removing it)\n" +msgstr "" + +msgid "(starting inotify server)\n" +msgstr "" + +msgid "could not start inotify server: %s\n" +msgstr "" + +msgid "could not talk to new inotify server: %s\n" +msgstr "" + +msgid "(inotify server not running)\n" +msgstr "(server inotify non in esecuzione\n" + +msgid "failed to contact inotify server: %s\n" +msgstr "non sono riuscito a contattare il server inotify: %s\n" + +msgid "run server in background" +msgstr "avvia il server in background" + +msgid "used internally by daemon mode" +msgstr "usato internamente dalla modalità demone" + +msgid "minutes to sit idle before exiting" +msgstr "" + +msgid "name of file to write process ID to" +msgstr "" + +msgid "hg inserve [OPT]..." +msgstr "" + +msgid "interhg: invalid pattern for %s: %s\n" +msgstr "" + +msgid "interhg: invalid regexp for %s: %s\n" +msgstr "" + +msgid "" +"keyword expansion in local repositories\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$\n" +"in tracked text files selected by your configuration.\n" +"\n" +"Keywords are only expanded in local repositories and not stored in\n" +"the change history. The mechanism can be regarded as a convenience\n" +"for the current user or for archive distribution.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections\n" +"of hgrc files.\n" +"\n" +"Example:\n" +"\n" +" [keyword]\n" +" # expand keywords in every python file except those matching \"x*\"\n" +" **.py =\n" +" x* = ignore\n" +"\n" +"Note: the more specific you are in your filename patterns\n" +" the less you lose speed in huge repos.\n" +"\n" +"For [keywordmaps] template mapping and expansion demonstration and\n" +"control run \"hg kwdemo\".\n" +"\n" +"An additional date template filter {date|utcdate} is provided.\n" +"\n" +"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" +"with customized keywords and templates.\n" +"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"\n" +"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +"the risk of inadvertedly storing expanded keywords in the change history.\n" +"\n" +"To force expansion after enabling it, or a configuration change, run\n" +"\"hg kwexpand\".\n" +"\n" +"Also, when committing with the record extension or using mq's qrecord, be " +"aware\n" +"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" +"question to update keyword expansions after all changes have been checked " +"in.\n" +"\n" +"Expansions spanning more than one line and incremental expansions,\n" +"like CVS' $Log$, are not supported. A keyword template map\n" +"\"Log = {desc}\" expands to the first line of the changeset description.\n" +msgstr "" + +msgid "Returns hgdate in cvs-like UTC format." +msgstr "" + +msgid "" +"\n" +" Sets up keyword templates, corresponding keyword regex, and\n" +" provides keyword substitution functions.\n" +" " +msgstr "" + +msgid "Replaces keywords in data with expanded template." +msgstr "" + +msgid "Returns data with keywords expanded." +msgstr "" + +msgid "" +"Returns true if path matches [keyword] pattern\n" +" and is not a symbolic link.\n" +" Caveat: localrepository._link fails on Windows." +msgstr "" + +msgid "Overwrites selected files expanding/shrinking keywords." +msgstr "" + +msgid "overwriting %s %s keywords\n" +msgstr "" + +msgid "Unconditionally removes all keyword substitutions from text." +msgstr "" + +msgid "Returns text with all keyword substitutions removed." +msgstr "" + +msgid "Returns lines with keyword substitutions removed." +msgstr "" + +msgid "" +"If in restricted mode returns data read from wdir with\n" +" keyword substitutions removed." +msgstr "" + +msgid "" +"\n" +" Subclass of filelog to hook into its read, add, cmp methods.\n" +" Keywords are \"stored\" unexpanded, and processed on reading.\n" +" " +msgstr "" + +msgid "Expands keywords when reading filelog." +msgstr "" + +msgid "Removes keyword substitutions when adding to filelog." +msgstr "" + +msgid "Removes keyword substitutions for comparison." +msgstr "" + +msgid "" +"Bails out if [keyword] configuration is not active.\n" +" Returns status of working directory." +msgstr "" +"Esce se la configurazione [keyword] non è attiva.\n" +" Restituisce lo stato della directory di lavoro." + +msgid "[keyword] patterns cannot match" +msgstr "" + +msgid "no [keyword] patterns configured" +msgstr "" + +msgid "Selects files and passes them to kwtemplater.overwrite." +msgstr "" + +msgid "" +"print [keywordmaps] configuration and an expansion example\n" +"\n" +" Show current, custom, or default keyword template maps\n" +" and their expansion.\n" +"\n" +" Extend current configuration by specifying maps as arguments\n" +" and optionally by reading from an additional hgrc file.\n" +"\n" +" Override current keyword template maps with \"default\" option.\n" +" " +msgstr "" + +msgid "" +"\n" +"\t%s\n" +msgstr "" + +msgid "creating temporary repo at %s\n" +msgstr "" + +msgid "" +"\n" +"%s keywords written to %s:\n" +msgstr "" + +msgid "unhooked all commit hooks\n" +msgstr "" + +msgid "" +"\n" +"removing temporary repo %s\n" +msgstr "" + +msgid "" +"expand keywords in working directory\n" +"\n" +" Run after (re)enabling keyword expansion.\n" +"\n" +" kwexpand refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"print files currently configured for keyword expansion\n" +"\n" +" Crosscheck which files in working directory are potential targets for\n" +" keyword expansion.\n" +" That is, files matched by [keyword] config patterns but not symlinks.\n" +" " +msgstr "" + +msgid "" +"revert expanded keywords in working directory\n" +"\n" +" Run before changing/disabling active keywords\n" +" or if you experience problems with \"hg import\" or \"hg merge\".\n" +"\n" +" kwshrink refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"Collects [keyword] config in kwtools.\n" +" Monkeypatches dispatch._parse if needed." +msgstr "" + +msgid "Monkeypatch dispatch._parse to obtain running hg command." +msgstr "" + +msgid "" +"Sets up repo as kwrepo for keyword substitution.\n" +" Overrides file method to return kwfilelog instead of filelog\n" +" if file matches user configuration.\n" +" Wraps commit to overwrite configured files with updated\n" +" keyword substitutions.\n" +" Monkeypatches patch and webcommands." +msgstr "" + +msgid "" +"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" +" rejects or conflicts due to expanded keywords in working dir." +msgstr "" + +msgid "" +"Monkeypatch patch.diff to avoid expansion except when\n" +" comparing against working dir." +msgstr "" + +msgid "Wraps webcommands.x turning off keyword expansion." +msgstr "" + +msgid "show default keyword template maps" +msgstr "" + +msgid "read maps from rcfile" +msgstr "" + +msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." +msgstr "" + +msgid "hg kwexpand [OPTION]... [FILE]..." +msgstr "hg kwexpand [OPZIONI]... [FILE]..." + +msgid "show keyword status flags of all files" +msgstr "" + +msgid "show files excluded from expansion" +msgstr "" + +msgid "additionally show untracked files" +msgstr "" + +msgid "hg kwfiles [OPTION]... [FILE]..." +msgstr "hg kwfiles [OPZIONI]... [FILE]..." + +msgid "hg kwshrink [OPTION]... [FILE]..." +msgstr "hg kwshrink [OPZIONI]... [FILE]..." + +msgid "" +"patch management and development\n" +"\n" +"This extension lets you work with a stack of patches in a Mercurial\n" +"repository. It manages two stacks of patches - all known patches, and\n" +"applied patches (subset of known patches).\n" +"\n" +"Known patches are represented as patch files in the .hg/patches\n" +"directory. Applied patches are both patch files and changesets.\n" +"\n" +"Common tasks (use \"hg help command\" for more details):\n" +"\n" +"prepare repository to work with patches qinit\n" +"create new patch qnew\n" +"import existing patch qimport\n" +"\n" +"print patch series qseries\n" +"print applied patches qapplied\n" +"print name of top applied patch qtop\n" +"\n" +"add known patch to applied stack qpush\n" +"remove patch from applied stack qpop\n" +"refresh contents of top applied patch qrefresh\n" +msgstr "" + +msgid "" +"Update all references to a field in the patch header.\n" +" If none found, add it email style." +msgstr "" +"Aggiorna tutti i riferimenti ad un campo nell'intestazione della patch.\n" +" If none found, add it email style." + +msgid "" +"Remove existing message, keeping the rest of the comments fields.\n" +" If comments contains 'subject: ', message will prepend\n" +" the field and a blank line." +msgstr "" + +msgid "%s appears more than once in %s" +msgstr "%s compare più di una volta in %s" + +msgid "guard cannot be an empty string" +msgstr "una guardia non può essere una stringa vuota" + +msgid "guard %r starts with invalid character: %r" +msgstr "la guardia %r inizia con un carattere non valido: %r" + +msgid "invalid character in guard %r: %r" +msgstr "carattere non valido nella guardia %r: %r" + +msgid "active guards: %s\n" +msgstr "guardie attive: %s\n" + +msgid "guard %r too short" +msgstr "la guardia %r è troppo corta" + +msgid "guard %r starts with invalid char" +msgstr "la guardia %r inizia con un carattere non valido" + +msgid "allowing %s - no guards in effect\n" +msgstr "" + +msgid "allowing %s - no matching negative guards\n" +msgstr "" + +msgid "allowing %s - guarded by %r\n" +msgstr "" + +msgid "skipping %s - guarded by %r\n" +msgstr "sto saltando %s - controllato da %r\n" + +msgid "skipping %s - no matching guards\n" +msgstr "sto saltando %s - nessuna guardia corrispondente\n" + +msgid "error removing undo: %s\n" +msgstr "" + +msgid "apply failed for patch %s" +msgstr "applicazione della patch %s fallita" + +msgid "patch didn't work out, merging %s\n" +msgstr "" + +msgid "update returned %d" +msgstr "l'aggiornamento ha restituito %d" + +msgid "repo commit failed" +msgstr "commit del repository fallito" + +msgid "unable to read %s" +msgstr "impossibile leggere %s" + +msgid "patch %s does not exist\n" +msgstr "la patch %s non esiste\n" + +msgid "patch %s is not applied\n" +msgstr "la patch %s non è applicata\n" + +msgid "" +"Apply patchfile to the working directory.\n" +" patchfile: file name of patch" +msgstr "" + +msgid "patch failed, unable to continue (try -v)\n" +msgstr "patch fallita, impossibile continuare (provare con -v)\n" + +msgid "applying %s\n" +msgstr "sto applicando %s\n" + +msgid "Unable to read %s\n" +msgstr "Impossibile leggere %s\n" + +msgid "imported patch %s\n" +msgstr "patch %s importata\n" + +msgid "" +"\n" +"imported patch %s" +msgstr "" +"\n" +"patch %s importata" + +msgid "patch %s is empty\n" +msgstr "la patch %s è vuota\n" + +msgid "patch failed, rejects left in working dir\n" +msgstr "" + +msgid "fuzz found when applying patch, stopping\n" +msgstr "" + +msgid "revision %d is not managed" +msgstr "" + +msgid "cannot delete revision %d above applied patches" +msgstr "" + +msgid "qdelete requires at least one revision or patch name" +msgstr "" + +msgid "cannot delete applied patch %s" +msgstr "" + +msgid "patch %s not in series file" +msgstr "" + +msgid "no patches applied" +msgstr "" + +msgid "working directory revision is not qtip" +msgstr "" + +msgid "local changes found, refresh first" +msgstr "" + +msgid "local changes found" +msgstr "" + +msgid "\"%s\" cannot be used as the name of a patch" +msgstr "" + +msgid "" +"options:\n" +" msg: a string or a no-argument function returning a string\n" +" " +msgstr "" + +msgid "patch \"%s\" already exists" +msgstr "la patch \"%s\" esiste gi" + +msgid "error unlinking %s\n" +msgstr "" + +msgid "returns (index, rev, patch)" +msgstr "" + +msgid "patch name \"%s\" is ambiguous:\n" +msgstr "il nome della patch \"%s\" ambiguo:\n" + +msgid "patch %s not in series" +msgstr "la patch %s non nella serie" + +msgid "(working directory not at tip)\n" +msgstr "(directory di lavoro non tip)\n" + +msgid "no patches in series\n" +msgstr "nessuna patch nella serie\n" + +msgid "cannot push to a previous patch: %s" +msgstr "impossibile fare push su una patch precedente: %s" + +msgid "qpush: %s is already at the top\n" +msgstr "qpush: %s gi in cima\n" + +msgid "guarded by %r" +msgstr "controllato da %r" + +msgid "no matching guards" +msgstr "nessuna guardia corrispondente" + +msgid "cannot push '%s' - %s\n" +msgstr "impossibile fare push di '%s' - %s\n" + +msgid "all patches are currently applied\n" +msgstr "tutte le patch sono correntemente applicate\n" + +msgid "patch series already fully applied\n" +msgstr "la serie di patch gi stata applicata completamente\n" + +msgid "cleaning up working directory..." +msgstr "sto pulendo la directory di lavoro..." + +msgid "errors during apply, please fix and refresh %s\n" +msgstr "" +"errori durante l'applicazione, si prega di correggere e aggiornare %s\n" + +msgid "now at: %s\n" +msgstr "ora a: %s\n" + +msgid "patch %s is not applied" +msgstr "la patch %s non applicata" + +msgid "no patches applied\n" +msgstr "nessuna patch applicata\n" + +msgid "qpop: %s is already at the top\n" +msgstr "" + +msgid "qpop: forcing dirstate update\n" +msgstr "" + +msgid "trying to pop unknown node %s" +msgstr "" + +msgid "popping would remove a revision not managed by this patch queue" +msgstr "" + +msgid "deletions found between repo revs" +msgstr "" + +msgid "patch queue now empty\n" +msgstr "" + +msgid "cannot refresh a revision with children" +msgstr "" + +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" +msgstr "" + +msgid "patch queue directory already exists" +msgstr "" + +msgid "patch %s is not in series file" +msgstr "" + +msgid "No saved patch data found\n" +msgstr "" + +msgid "restoring status: %s\n" +msgstr "sto ripristinando lo stato: %s\n" + +msgid "save entry has children, leaving it alone\n" +msgstr "" + +msgid "removing save entry %s\n" +msgstr "" + +msgid "saved queue repository parents: %s %s\n" +msgstr "" + +msgid "queue directory updating\n" +msgstr "" + +msgid "Unable to load queue repository\n" +msgstr "Impossibile caricare il repository della coda\n" + +msgid "save: no patches applied, exiting\n" +msgstr "" + +msgid "status is already saved\n" +msgstr "lo status è già stato salvato\n" + +msgid "hg patches saved state" +msgstr "" + +msgid "repo commit failed\n" +msgstr "commit del repository fallito\n" + +msgid "" +"If all_patches is False, return the index of the next pushable patch\n" +" in the series, or the series length. If all_patches is True, return " +"the\n" +" index of the first patch past the last applied one.\n" +" " +msgstr "" + +msgid "patch %s is already in the series file" +msgstr "la patch %s gi nel file series" + +msgid "option \"-r\" not valid when importing files" +msgstr "l'opzione \"-r\" non è valida quando si importano file" + +msgid "option \"-n\" not valid when importing multiple patches" +msgstr "l'opzione \"-n\" non è valida quando si importano patch multiple" + +msgid "revision %d is the root of more than one branch" +msgstr "" + +msgid "revision %d is already managed" +msgstr "" + +msgid "revision %d is not the parent of the queue" +msgstr "" + +msgid "revision %d has unmanaged children" +msgstr "" + +msgid "cannot import merge revision %d" +msgstr "" + +msgid "revision %d is not the parent of %d" +msgstr "la revisione %d non il genitore di %d" + +msgid "-e is incompatible with import from -" +msgstr "-e incompatibile con l'import da -" + +msgid "patch %s does not exist" +msgstr "la patch %s non esiste" + +msgid "need --name to import a patch from -" +msgstr "necessario --name per importare una patch da -" + +msgid "adding %s to series file\n" +msgstr "sto aggiungendo %s al file series\n" + +msgid "" +"remove patches from queue\n" +"\n" +" The patches must not be applied, unless they are arguments to\n" +" the --rev parameter. At least one patch or revision is required.\n" +"\n" +" With --rev, mq will stop managing the named revisions (converting\n" +" them to regular mercurial changesets). The qfinish command should be\n" +" used as an alternative for qdel -r, as the latter option is deprecated.\n" +"\n" +" With --keep, the patch files are preserved in the patch directory." +msgstr "" + +msgid "print the patches already applied" +msgstr "stampa le patch gi applicate" + +msgid "print the patches not yet applied" +msgstr "stampa le patch non ancora applicate" + +msgid "" +"import a patch\n" +"\n" +" The patch is inserted into the series after the last applied patch.\n" +" If no patches have been applied, qimport prepends the patch\n" +" to the series.\n" +"\n" +" The patch will have the same name as its source file unless you\n" +" give it a new one with --name.\n" +"\n" +" You can register an existing patch inside the patch directory\n" +" with the --existing flag.\n" +"\n" +" With --force, an existing patch of the same name will be overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with --rev\n" +" (e.g. qimport --rev tip -n patch will place tip under mq control).\n" +" With --git, patches imported with --rev will use the git diff\n" +" format. See the diffs help topic for information on why this is\n" +" important for preserving rename/copy information and permission " +"changes.\n" +" " +msgstr "" + +msgid "" +"init a new queue repository\n" +"\n" +" The queue repository is unversioned by default. If -c is\n" +" specified, qinit will create a separate nested repository\n" +" for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one).\n" +" You can use qcommit to commit changes to this queue repository." +msgstr "" +"inizializza un nuovo repository della coda\n" +"\n" +" Il repository della coda di default non è sotto controllo di\n" +" versione. Se viene specificato -c, qinit creerà un separato\n" +" repository annidato per le patch (qinit -c potrebbe anche essere\n" +" eseguito in seguito per convertire un repository non gestito in\n" +" uno gestito).\n" +" Si può usare qcommit per effettuare il commit delle modifiche in\n" +" questo repository della coda." + +msgid "" +"clone main and patch repository at same time\n" +"\n" +" If source is local, destination will have no patches applied. If\n" +" source is remote, this command can not check if patches are\n" +" applied in source, so cannot guarantee that patches are not\n" +" applied in destination. If you clone remote repository, be sure\n" +" before that it has no patches applied.\n" +"\n" +" Source patch repository is looked for in <src>/.hg/patches by\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested mercurial repository, as\n" +" would be created by qinit -c.\n" +" " +msgstr "" + +msgid "versioned patch repository not found (see qinit -c)" +msgstr "" +"repository delle patch sotto controllo di versione non trovato (vedere qinit " +"-c)" + +msgid "cloning main repo\n" +msgstr "sto clonando il repository principale\n" + +msgid "cloning patch repo\n" +msgstr "sto clonando il repository delle patch\n" + +msgid "stripping applied patches from destination repo\n" +msgstr "sto rimuovendo le patch applicate dal repository di destinazione\n" + +msgid "updating destination repo\n" +msgstr "sto aggiornando il repository di destinazione\n" + +msgid "commit changes in the queue repository" +msgstr "effettua il commit delle modifiche nel repository della coda" + +msgid "print the entire series file" +msgstr "stampa l'intero file series" + +msgid "print the name of the current patch" +msgstr "stampa il nome della patch corrente" + +msgid "print the name of the next patch" +msgstr "stampa il nome della patch seguente" + +msgid "all patches applied\n" +msgstr "tutte le patch sono state applicate\n" + +msgid "print the name of the previous patch" +msgstr "stampa il nome della patch precedente" + +msgid "only one patch applied\n" +msgstr " stata applicata solo una patch\n" + +msgid "" +"create a new patch\n" +"\n" +" qnew creates a new patch on top of the currently-applied patch (if " +"any).\n" +" It will refuse to run if there are any outstanding changes unless -f is\n" +" specified, in which case the patch will be initialized with them. You\n" +" may also use -I, -X, and/or a list of files after the patch name to add\n" +" only changes to matching files to the new patch, leaving the rest as\n" +" uncommitted modifications.\n" +"\n" +" -u and -d can be used to set the (given) user and date, respectively.\n" +" -U and -D set user to current user and date to current date.\n" +"\n" +" -e, -m or -l set the patch header as well as the commit message. If " +"none\n" +" is specified, the header is empty and the commit message is '[mq]: " +"PATCH'.\n" +"\n" +" Use the --git option to keep the patch in the git extended diff\n" +" format. Read the diffs help topic for more information on why this\n" +" is important for preserving permission changes and copy/rename\n" +" information.\n" +" " +msgstr "" +"crea una nuova patch\n" +"\n" +" qnew crea una nuova patch sopra alla patch correntemente applicata\n" +" (seesiste).\n" +" Si rifiuter di farlo se ci sono modifiche pendenti a meno che -f\n" +" non sia stato specificato, nel qual caso la patch sar\n" +" inizializzata con tali modifiche. Si potrebbe anche usare -I, -X,\n" +" e/o una lista di file dopo il nome della patch per aggiungere alla\n" +" patch solamente le modifiche a tali file, lasciando il resto come\n" +" cambiamenti non salvati.\n" +"\n" +" -u e -d possono essere usati per impostare rispettivamente un dato\n" +" utente e data.\n" +" -U e -D impostano l'utente all'utente corrente e la data alla data\n" +" corrente.\n" +"\n" +" -e, -m o -l impostano l'intestazione della patch cos come il\n" +" messaggio di commit. Se nulla stato specificato, l'intestazione\n" +" sar vuota e il messaggio di commit '[mq]: PATCH'.\n" +"\n" +" Usa l'opzione --git per mantenere la patch nel formato diff esteso\n" +" git. Leggere le informazioni di aiuto sui diff per maggiori\n" +" informazioni sul motivo per cui quest'opzione importante per\n" +" preservare modifiche di permessi e informazioni su copie/rinomine.\n" +" " + +msgid "" +"update the current patch\n" +"\n" +" If any file patterns are provided, the refreshed patch will contain " +"only\n" +" the modifications that match those patterns; the remaining " +"modifications\n" +" will remain in the working directory.\n" +"\n" +" If --short is specified, files currently included in the patch will\n" +" be refreshed just like matched files and remain in the patch.\n" +"\n" +" hg add/remove/copy/rename work as usual, though you might want to use\n" +" git-style patches (--git or [diff] git=1) to track copies and renames.\n" +" See the diffs help topic for more information on the git diff format.\n" +" " +msgstr "" + +msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" +msgstr "l'opzione \"-e\" è incompatibile con \"-m\" o \"-l\"" + +msgid "" +"diff of the current patch and subsequent modifications\n" +"\n" +" Shows a diff which includes the current patch as well as any changes " +"which\n" +" have been made in the working directory since the last refresh (thus\n" +" showing what the current patch would become after a qrefresh).\n" +"\n" +" Use 'hg diff' if you only want to see the changes made since the last\n" +" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" +" current patch without including changes made since the qrefresh.\n" +" " +msgstr "" + +msgid "" +"fold the named patches into the current patch\n" +"\n" +" Patches must not yet be applied. Each patch will be successively\n" +" applied to the current patch in the order given. If all the\n" +" patches apply successfully, the current patch will be refreshed\n" +" with the new cumulative patch, and the folded patches will\n" +" be deleted. With -k/--keep, the folded patch files will not\n" +" be removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with\n" +" the current patch header, separated by a line of '* * *'." +msgstr "" + +msgid "qfold requires at least one patch name" +msgstr "" + +msgid "No patches applied" +msgstr "" + +msgid "Skipping already folded patch %s" +msgstr "" + +msgid "qfold cannot fold already applied patch %s" +msgstr "" + +msgid "Error folding patch %s" +msgstr "" + +msgid "push or pop patches until named patch is at top of stack" +msgstr "" + +msgid "" +"set or print guards for a patch\n" +"\n" +" Guards control whether a patch can be pushed. A patch with no\n" +" guards is always pushed. A patch with a positive guard (\"+foo\") is\n" +" pushed only if the qselect command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" has activated it.\n" +"\n" +" With no arguments, print the currently active guards.\n" +" With arguments, set guards for the named patch.\n" +"\n" +" To set a negative guard \"-foo\" on topmost patch (\"--\" is needed so\n" +" hg will not interpret \"-foo\" as an option):\n" +" hg qguard -- -foo\n" +"\n" +" To set guards on another patch:\n" +" hg qguard other.patch +2.6.17 -stable\n" +" " +msgstr "" + +msgid "cannot mix -l/--list with options or arguments" +msgstr "" + +msgid "no patch to work with" +msgstr "" + +msgid "no patch named %s" +msgstr "" + +msgid "print the header of the topmost or specified patch" +msgstr "" + +msgid "" +"push the next patch onto the stack\n" +"\n" +" When --force is applied, all local changes in patched files will be " +"lost.\n" +" " +msgstr "" + +msgid "no saved queues found, please use -n\n" +msgstr "" + +msgid "merging with queue at: %s\n" +msgstr "" + +msgid "" +"pop the current patch off the stack\n" +"\n" +" By default, pops off the top of the patch stack. If given a patch name,\n" +" keeps popping off patches until the named patch is at the top of the " +"stack.\n" +" " +msgstr "" + +msgid "using patch queue: %s\n" +msgstr "" + +msgid "" +"rename a patch\n" +"\n" +" With one argument, renames the current patch to PATCH1.\n" +" With two arguments, renames PATCH1 to PATCH2." +msgstr "" +"rinomina una patch\n" +"\n" +" Con un argomento rinomina la patch corrente in PATCH1.\n" +" Con due argomenti rinomina PATCH1 in PATCH2." + +msgid "%s already exists" +msgstr "%s esiste già" + +msgid "A patch named %s already exists in the series file" +msgstr "Una patch chiamata %s esiste già nel file series" + +msgid "restore the queue state saved by a rev" +msgstr "ripristina lo stato della coda salvato da una revisione" + +msgid "save current queue state" +msgstr "salva lo stato corrente della coda" + +msgid "destination %s exists and is not a directory" +msgstr "la destinazione %s esiste e non è una directory" + +msgid "destination %s exists, use -f to force" +msgstr "la destinazione %s esiste, usare -f per forzare l'operazione" + +msgid "copy %s to %s\n" +msgstr "copia %s a %s\n" + +msgid "" +"strip a revision and all its descendants from the repository\n" +"\n" +" If one of the working dir's parent revisions is stripped, the working\n" +" directory will be updated to the parent of the stripped revision.\n" +" " +msgstr "" + +msgid "" +"set or print guarded patches to push\n" +"\n" +" Use the qguard command to set or print guards on patch, then use\n" +" qselect to tell mq which guards to use. A patch will be pushed if it\n" +" has no guards or any positive guards match the currently selected " +"guard,\n" +" but will not be pushed if any negative guards match the current guard.\n" +" For example:\n" +"\n" +" qguard foo.patch -stable (negative guard)\n" +" qguard bar.patch +stable (positive guard)\n" +" qselect stable\n" +"\n" +" This activates the \"stable\" guard. mq will skip foo.patch (because\n" +" it has a negative match) but push bar.patch (because it\n" +" has a positive match).\n" +"\n" +" With no arguments, prints the currently active guards.\n" +" With one argument, sets the active guard.\n" +"\n" +" Use -n/--none to deactivate guards (no other arguments needed).\n" +" When no guards are active, patches with positive guards are skipped\n" +" and patches with negative guards are pushed.\n" +"\n" +" qselect can change the guards on applied patches. It does not pop\n" +" guarded patches by default. Use --pop to pop back to the last applied\n" +" patch that is not guarded. Use --reapply (which implies --pop) to push\n" +" back to the current patch afterwards, but skip guarded patches.\n" +"\n" +" Use -s/--series to print a list of all guards in the series file (no\n" +" other arguments needed). Use -v for more information." +msgstr "" + +msgid "guards deactivated\n" +msgstr "guardie disattivate\n" + +msgid "number of unguarded, unapplied patches has changed from %d to %d\n" +msgstr "" +"il numero di patch non applicate, senza guardia è cambiato da %d a %d\n" + +msgid "number of guarded, applied patches has changed from %d to %d\n" +msgstr "il numero di patch applicate aventi guardia è cambiato da %d a %d\n" + +msgid "guards in series file:\n" +msgstr "guardie nel file series:\n" + +msgid "no guards in series file\n" +msgstr "nessuna guardia nel file series\n" + +msgid "active guards:\n" +msgstr "guardie attive:\n" + +msgid "no active guards\n" +msgstr "nessuna guardia attiva\n" + +msgid "popping guarded patches\n" +msgstr "sto disapplicando patch che hanno una guardia\n" + +msgid "reapplying unguarded patches\n" +msgstr "sto riapplicando patch che non hanno guardia\n" + +msgid "" +"move applied patches into repository history\n" +"\n" +" Finishes the specified revisions (corresponding to applied patches) by\n" +" moving them out of mq control into regular repository history.\n" +"\n" +" Accepts a revision range or the --applied option. If --applied is\n" +" specified, all applied mq revisions are removed from mq control.\n" +" Otherwise, the given revisions must be at the base of the stack of\n" +" applied patches.\n" +"\n" +" This can be especially useful if your changes have been applied to an\n" +" upstream repository, or if you are about to push your changes to " +"upstream.\n" +" " +msgstr "" + +msgid "no revisions specified" +msgstr "nessuna revisione specificata" + +msgid "cannot commit over an applied mq patch" +msgstr "impossibile effettuare commit su una patch mq applicata" + +msgid "source has mq patches applied" +msgstr "la sorgente ha patch mq applicate" + +msgid "mq status file refers to unknown node %s\n" +msgstr "il file dello stato di mq fa riferimento al nodo sconosciuto %s\n" + +msgid "Tag %s overrides mq patch of the same name\n" +msgstr "La tag %s annulla una patch mq con lo stesso nome\n" + +msgid "cannot import over an applied patch" +msgstr "impossibile importare sopra ad una patch applicata" + +msgid "print first line of patch header" +msgstr "stampa la prima riga dell'intestazione della patch" + +msgid "hg qapplied [-s] [PATCH]" +msgstr "hg qapplied [-s] [PATCH]" + +msgid "use pull protocol to copy metadata" +msgstr "usa il protocollo pull per copiare i metadati" + +msgid "do not update the new working directories" +msgstr "non aggiornare le nuove directory di lavoro" + +msgid "use uncompressed transfer (fast over LAN)" +msgstr "usa trasferimento non compresso (veloce su LAN)" + +msgid "location of source patch repo" +msgstr "posizione del repository delle patch sorgente" + +msgid "hg qclone [OPTION]... SOURCE [DEST]" +msgstr "hg qclone [OPZIONI]... SORGENTE [DEST]" + +msgid "hg qcommit [OPTION]... [FILE]..." +msgstr "hg qcommit [OPZIONI]... [FILE]..." + +msgid "hg qdiff [OPTION]... [FILE]..." +msgstr "hg qdiff [OPZIONI]... [FILE]..." + +msgid "keep patch file" +msgstr "mantieni il file della patch" + +msgid "stop managing a revision" +msgstr "smetti di gestire una revisione" + +msgid "hg qdelete [-k] [-r REV]... [PATCH]..." +msgstr "hg qdelete [-k] [-r REV]... [PATCH]..." + +msgid "edit patch header" +msgstr "modifica l'intestazione della patch" + +msgid "keep folded patch files" +msgstr "" + +msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." +msgstr "hg qfold [-e] [-k] [-m TESTO] [-l FILE] PATCH..." + +msgid "overwrite any local changes" +msgstr "sovrascrivi ogni modifica locale" + +msgid "hg qgoto [OPTION]... PATCH" +msgstr "hg qgoto [OPZIONI]... PATCH" + +msgid "list all patches and guards" +msgstr "elenca tutte le patch e le guardie" + +msgid "drop all guards" +msgstr "scarta tutte le guardie" + +msgid "hg qguard [-l] [-n] [PATCH] [+GUARD]... [-GUARD]..." +msgstr "hg qguard [-l] [-n] [PATCH] [+GUARDIA]... [-GUARDIA]..." + +msgid "hg qheader [PATCH]" +msgstr "hg qheader [PATCH]" + +msgid "import file in patch dir" +msgstr "importa il file nella directory delle patch" + +msgid "patch file name" +msgstr "nome del file della patch" + +msgid "overwrite existing files" +msgstr "sovrascrive i file esistenti" + +msgid "place existing revisions under mq control" +msgstr "metti le revisioni esistenti sotto il controllo di mq" + +msgid "use git extended diff format" +msgstr "usa il formato diff git esteso" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." +msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-r REV]... FILE..." + +msgid "create queue repository" +msgstr "crea il repository della coda" + +msgid "hg qinit [-c]" +msgstr "hg qinit [-c]" + +msgid "import uncommitted changes into patch" +msgstr "importa nella patch le modifiche di cui non si è effettuato il commit" + +msgid "add \"From: <current user>\" to patch" +msgstr "aggiunge \"Da: <utente corrente>\" alla patch" + +msgid "add \"From: <given user>\" to patch" +msgstr "aggiunge \"Da: <utente fornito>\" alla patch" + +msgid "add \"Date: <current date>\" to patch" +msgstr "aggiunge \"Data: <data corrente>\" alla patch" + +msgid "add \"Date: <given date>\" to patch" +msgstr "aggiunge \"Data: <data fornita>\" alla patch" + +msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." +msgstr "hg qnew [-e] [-m TESTO] [-l FILE] [-f] PATCH [FILE]..." + +msgid "hg qnext [-s]" +msgstr "hg qnext [-s]" + +msgid "hg qprev [-s]" +msgstr "hg qprev [-s]" + +msgid "pop all patches" +msgstr "disapplica tutte le patch" + +msgid "queue name to pop" +msgstr "" + +msgid "forget any local changes" +msgstr "dimentica ogni modifica locale" + +msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" +msgstr "hg qpop [-a] [-n NOME] [-f] [PATCH | INDEX]" + +msgid "apply if the patch has rejects" +msgstr "" + +msgid "list patch name in commit text" +msgstr "elenca il nome della patch nel testo di commit" + +msgid "apply all patches" +msgstr "applica tutte le patch" + +msgid "merge from another queue" +msgstr "effettua il merge da un'altra coda" + +msgid "merge queue name" +msgstr "" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOME] [PATCH | INDICE]" + +msgid "refresh only files already in the patch and specified files" +msgstr "aggiorna solo file già nella patch e quelli specificati" + +msgid "add/update \"From: <current user>\" in patch" +msgstr "aggiunge/aggiorna \"Da: <utente corrente>\" nella patch" + +msgid "add/update \"From: <given user>\" in patch" +msgstr "aggiunge/aggiorna \"Da: <utente fornito>\" nella patch" + +msgid "update \"Date: <current date>\" in patch (if present)" +msgstr "aggiorna \"Data: <data corrente>\" nella patch (se presente)" + +msgid "update \"Date: <given date>\" in patch (if present)" +msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)" + +msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." +msgstr "hg qrefresh [-I] [-X] [-e] [-m TESTO] [-l FILE] [-s] [FILE]..." + +msgid "hg qrename PATCH1 [PATCH2]" +msgstr "hg qrename PATCH1 [PATCH2]" + +msgid "delete save entry" +msgstr "" + +msgid "update queue working dir" +msgstr "aggiorna la directory di lavoro della coda" + +msgid "hg qrestore [-d] [-u] REV" +msgstr "hg qrestore [-d] [-u] REV" + +msgid "copy patch directory" +msgstr "copia la directory delle patch" + +msgid "copy directory name" +msgstr "copia il nome della directory" + +msgid "clear queue status file" +msgstr "pulisce il file di stato della coda" + +msgid "force copy" +msgstr "forza la copia" + +msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" +msgstr "hg qsave [-m TESTO] [-l FILE] [-c] [-n NOME] [-e] [-f]" + +msgid "disable all guards" +msgstr "disabilita tutte le guardie" + +msgid "list all guards in series file" +msgstr "elenca tutte le guardie nel file series" + +msgid "pop to before first guarded applied patch" +msgstr "" + +msgid "pop, then reapply patches" +msgstr "disapplica e poi riapplica le patch" + +msgid "hg qselect [OPTION]... [GUARD]..." +msgstr "hg qselect [OPZIONE]... [GUARDIA]..." + +msgid "print patches not in series" +msgstr "stampa le patch non in series" + +msgid "hg qseries [-ms]" +msgstr "hg qseries [-ms]" + +msgid "force removal with local changes" +msgstr "forza la rimozione con modifiche locali" + +msgid "bundle unrelated changesets" +msgstr "" + +msgid "no backups" +msgstr "nessun backup" + +msgid "hg strip [-f] [-b] [-n] REV" +msgstr "hg strip [-f] [-b] [-n] REV" + +msgid "hg qtop [-s]" +msgstr "hg qtop [-s]" + +msgid "hg qunapplied [-s] [PATCH]" +msgstr "hg qunapplied [-s] [PATCH]" + +msgid "finish all applied changesets" +msgstr "finalizza tutti i changeset applicati" + +msgid "hg qfinish [-a] [REV...]" +msgstr "hg qfinish [-a] [REV...]" + +msgid "" +"hook extension to email notifications on commits/pushes\n" +"\n" +"Subscriptions can be managed through hgrc. Default mode is to print\n" +"messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure notify extension and enable in hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go in here\n" +"\n" +" config items:\n" +"\n" +" REQUIRED:\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +" OPTIONAL:\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" +" # (serve == ssh or http, push, pull, bundle)\n" +" [email]\n" +" from = user@host.com # email address to send as if none given\n" +" [web]\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +" notify config file has same format as regular hgrc. it has two\n" +" sections so you can express subscriptions in whatever way is handier\n" +" for you.\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob " +"patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber " +"emails\n" +" pattern = user@host\n" +"\n" +" glob patterns are matched against path to repo root.\n" +"\n" +" if you like, you can put notify config file in repo that users can\n" +" push changes to, they can manage their own subscriptions." +msgstr "" + +msgid "email notification class." +msgstr "" + +msgid "strip leading slashes from local path, turn into web-safe path." +msgstr "" + +msgid "try to clean up email addresses." +msgstr "" + +msgid "return list of email addresses of subscribers to this repo." +msgstr "" + +msgid "format one changeset." +msgstr "formatta un changeset." + +msgid "true if incoming changes from this source should be skipped." +msgstr "" + +msgid "send message." +msgstr "invia messaggio." + +msgid "try to make subject line exist and be useful." +msgstr "" + +msgid "%s: %d new changesets" +msgstr "%s: %d nuovi changeset" + +msgid "try to make message have proper sender." +msgstr "" + +msgid "notify: sending %d subscribers %d changes\n" +msgstr "" + +msgid "" +"\n" +"diffs (truncated from %d to %d lines):\n" +"\n" +msgstr "" + +msgid "" +"\n" +"diffs (%d lines):\n" +"\n" +msgstr "" + +msgid "" +"send email notifications to interested subscribers.\n" +"\n" +" if used as changegroup hook, send one email for all changesets in\n" +" changegroup. else send one email per changeset." +msgstr "" + +msgid "notify: no subscribers to repo %s\n" +msgstr "" + +msgid "notify: changes have source \"%s\" - skipping\n" +msgstr "" + +msgid "" +"browse command output with external pager\n" +"\n" +"To set the pager that should be used, set the application variable:\n" +"\n" +" [pager]\n" +" pager = LESS='FSRX' less\n" +"\n" +"If no pager is set, the pager extensions uses the environment\n" +"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" +"is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" +"by setting:\n" +"\n" +" [pager]\n" +" quiet = True\n" +"\n" +"You can disable the pager for certain commands by adding them to the\n" +"pager.ignore list:\n" +"\n" +" [pager]\n" +" ignore = version, help, update\n" +"\n" +"You can also enable the pager only for certain commands using pager.attend:\n" +"\n" +" [pager]\n" +" attend = log\n" +"\n" +"If pager.attend is present, pager.ignore will be ignored.\n" +"\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to " +"specify\n" +"them in the global .hgrc\n" +msgstr "" + +msgid "" +"use suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to\n" +"the ancestors of a specific revision.\n" +"\n" +"For example, if you can refer to a revision as \"foo\", then:\n" +"\n" +"- foo^N = Nth parent of foo:\n" +" foo^0 = foo\n" +" foo^1 = first parent of foo\n" +" foo^2 = second parent of foo\n" +" foo^ = foo^1\n" +"\n" +"- foo~N = Nth first grandparent of foo\n" +" foo~0 = foo\n" +" foo~1 = foo^1 = foo^ = first parent of foo\n" +" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" +msgstr "" + +msgid "" +"sending Mercurial changesets as a series of patch emails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" +"which describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +"the first line of the changeset description as the subject text.\n" +"The message contains two or three body parts:\n" +"\n" +" The remainder of the changeset description.\n" +"\n" +" [Optional] The result of running diffstat on the patch.\n" +"\n" +" The patch itself, as generated by \"hg export\".\n" +"\n" +"Each message refers to all of its predecessors using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in\n" +"threaded mail and news readers, and in mail archives.\n" +"\n" +"For each changeset, you will be prompted with a diffstat summary and\n" +"the changeset summary, so you can be sure you are sending the right " +"changes.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.patchbomb =\n" +"\n" +"To configure other defaults, add a section like this to your hgrc file:\n" +"\n" +" [email]\n" +" from = My Name <my@email>\n" +" to = recipient1, recipient2, ...\n" +" cc = cc1, cc2, ...\n" +" bcc = bcc1, bcc2, ...\n" +"\n" +"Then you can use the \"hg email\" command to mail a series of changesets\n" +"as a patchbomb.\n" +"\n" +"To avoid sending patches prematurely, it is a good idea to first run\n" +"the \"email\" command with the \"-n\" option (test only). You will be\n" +"prompted for an email recipient address, a subject an an introductory\n" +"message describing the patches of your patchbomb. Then when all is\n" +"done, patchbomb messages are displayed. If PAGER environment variable\n" +"is set, your pager will be fired up once for each patchbomb message, so\n" +"you can verify everything is alright.\n" +"\n" +"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" +"each patchbomb message in a pager or sending the messages directly,\n" +"it will create a UNIX mailbox file with the patch emails. This\n" +"mailbox file can be previewed with any mail user agent which supports\n" +"UNIX mbox files, i.e. with mutt:\n" +"\n" +" % mutt -R -f mbox\n" +"\n" +"When you are previewing the patchbomb messages, you can use `formail'\n" +"(a utility that is commonly installed as part of the procmail package),\n" +"to send each message out:\n" +"\n" +" % formail -s sendmail -bm -t < mbox\n" +"\n" +"That should be all. Now your patchbomb is on its way out." +msgstr "" + +msgid "Please enter a valid value.\n" +msgstr "Si prega di inserire un valore valido.\n" + +msgid "does the diffstat above look okay? " +msgstr "" + +msgid "diffstat rejected" +msgstr "diffstat rifiutato" + +msgid "" +"send changesets by email\n" +"\n" +" By default, diffs are sent in the format generated by hg export,\n" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" +" introduction, which describes the series as a whole.\n" +"\n" +" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +" the first line of the changeset description as the subject text.\n" +" The message contains two or three body parts. First, the rest of\n" +" the changeset description. Next, (optionally) if the diffstat\n" +" program is installed, the result of running diffstat on the patch.\n" +" Finally, the patch itself, as generated by \"hg export\".\n" +"\n" +" With --outgoing, emails will be generated for patches not\n" +" found in the destination repository (or only those which are\n" +" ancestors of the specified revisions if any are provided)\n" +"\n" +" With --bundle, changesets are selected as for --outgoing,\n" +" but a single email containing a binary Mercurial bundle as an\n" +" attachment will be sent.\n" +"\n" +" Examples:\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +"\n" +" Before using this command, you will need to enable email in your hgrc.\n" +" See the [email] section in hgrc(5) for details.\n" +" " +msgstr "" + +msgid "Return the revisions present locally but not in dest" +msgstr "" + +msgid "specify at least one changeset with -r or -o" +msgstr "" + +msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" +msgstr "" + +msgid "too many destinations" +msgstr "troppe destinazioni" + +msgid "use only one form to specify the revision" +msgstr "usa solo un formato per specificare la revisione" + +msgid "" +"\n" +"Write the introductory message for the patch series.\n" +"\n" +msgstr "" +"\n" +"Scrivi il messaggio introduttivo per la serie di patch.\n" +"\n" + +msgid "" +"This patch series consists of %d patches.\n" +"\n" +msgstr "" +"Questa serie di patch consiste di %d patch.\n" +"\n" + +msgid "Final summary:\n" +msgstr "Sommario finale:\n" + +msgid "Displaying " +msgstr "Sto mostrando" + +msgid "Writing " +msgstr "Sto scrivendo" + +msgid "Sending " +msgstr "Sto inviando" + +msgid "send patches as attachments" +msgstr "invia patch come allegati" + +msgid "send patches as inline attachments" +msgstr "invia patch come allegati in linea" + +msgid "email addresses of blind copy recipients" +msgstr "indirizzi mail dei destinatari in copia nascosta" + +msgid "email addresses of copy recipients" +msgstr "indirizzi mail dei destinatari in copia" + +msgid "add diffstat output to messages" +msgstr "aggiungi l'output del diffstat ai messaggi" + +msgid "use the given date as the sending date" +msgstr "usa la data fornita come data di invio" + +msgid "use the given file as the series description" +msgstr "usa il file fornito come descrizione della serie" + +msgid "email address of sender" +msgstr "indirizzo email del mittente" + +msgid "print messages that would be sent" +msgstr "stampa i messaggi che verrebbero inviati" + +msgid "write messages to mbox file instead of sending them" +msgstr "scrive i messaggi nel file mbox invece di inviarli" + +msgid "subject of first message (intro or single patch)" +msgstr "soggetto del primo messaggio (introduzione o patch singola)" + +msgid "email addresses of recipients" +msgstr "indirizzi mail dei destinatari" + +msgid "omit hg patch header" +msgstr "ometti l'intestazione della patch hg" + +msgid "send changes not found in the target repository" +msgstr "invia le modifiche non trovate nel repository di destinazione" + +msgid "send changes not in target as a binary bundle" +msgstr "invia le modifiche non in target come bundle binario" + +msgid "a revision to send" +msgstr "una revisione da inviare" + +msgid "run even when remote repository is unrelated (with -b)" +msgstr "esegui anche quando il repository remoto non è collegato (con -b)" + +msgid "a base changeset to specify instead of a destination (with -b)" +msgstr "un changeset base da specificare invece di una destinazione (con -b)" + +msgid "send an introduction email for a single patch" +msgstr "invia una mail introduttiva per una patch singola" + +msgid "hg email [OPTION]... [DEST]..." +msgstr "hg email [OPZIONI]... [DEST]..." + +msgid "" +"removes files not tracked by Mercurial\n" +"\n" +" Delete files not known to Mercurial. This is useful to test local and\n" +" uncommitted changes in an otherwise-clean source tree.\n" +"\n" +" This means that purge will delete:\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless they\n" +" contain files under source control managment\n" +" But it will leave untouched:\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" +"\n" +" If directories are given on the command line, only files in these\n" +" directories are considered.\n" +"\n" +" Be careful with purge, as you could irreversibly delete some files you\n" +" forgot to add to the repository. If you only want to print the list of\n" +" files that this program would delete, use the --print option.\n" +" " +msgstr "" + +msgid "%s cannot be removed" +msgstr "%s non può essere rimosso" + +msgid "warning: %s\n" +msgstr "attenzione: %s\n" + +msgid "Removing file %s\n" +msgstr "Sto rimuovendo il file %s\n" + +msgid "Removing directory %s\n" +msgstr "Sto rimuovendo la directory %s\n" + +msgid "abort if an error occurs" +msgstr "abortisce se si verifica un errore" + +msgid "purge ignored files too" +msgstr "rimuove anche i file ignorati" + +msgid "print the file names instead of deleting them" +msgstr "stampa i nomi dei file invece di cancellarli" + +msgid "end filenames with NUL, for use with xargs (implies -p)" +msgstr "termina il nome dei file con NUL, per usarli con xargs (implica -p)" + +msgid "hg purge [OPTION]... [DIR]..." +msgstr "hg purge [OPZIONI]... [DIR]..." + +msgid "" +"move sets of revisions to a different ancestor\n" +"\n" +"This extension lets you rebase changesets in an existing Mercurial " +"repository.\n" +"\n" +"For more information:\n" +"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +msgstr "" +"sposta insiemi di revisioni su un antenato differente\n" +"\n" +"Questa estensione consente di effettuare il rebase di changeset in un\n" +"repository Mercurial esistente.\n" +"\n" +"Per maggiori informazioni:\n" +"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" + +msgid "return the correct ancestor" +msgstr "restituisce l'antenato corretto" + +msgid "first revision, do not change ancestor\n" +msgstr "prima revisione, non cambia l'antenato\n" + +msgid "" +"move changeset (and descendants) to a different branch\n" +"\n" +" Rebase uses repeated merging to graft changesets from one part of " +"history\n" +" onto another. This can be useful for linearizing local changes relative " +"to\n" +" a master development tree.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be " +"continued\n" +" with --continue or aborted with --abort.\n" +" " +msgstr "" +"sposta changeset (e discendenti) su una branch differente\n" +"\n" +" Rebase usa merge ripetuti per trapiantare changeset da una parte\n" +" della storia in un'altra. Questo può essere utile per linearizzare\n" +" modifiche locali relative ad un albero di sviluppo principale.\n" +"\n" +" Se un rebase viene interrotto per risolvere manualmente un merge,\n" +" può essere ripreso con --continue o abortito con --abort.\n" +" " + +msgid "cannot use both keepbranches and extrafn" +msgstr "non è possibile usare sia keepbranches sia extrafn" + +msgid "cannot use both abort and continue" +msgstr "non è possibile usare sia abort sia continue" + +msgid "cannot use collapse with continue or abort" +msgstr "non è possibile usare collapse con continue o abort" + +msgid "abort and continue do not allow specifying revisions" +msgstr "abort e continue non consentono di specificare revisioni" + +msgid "cannot specify both a revision and a base" +msgstr "non è possibile specificare sia una revisione sia una base" + +msgid "nothing to rebase\n" +msgstr "niente di cui effettuare il rebase\n" + +msgid "rebase merging completed\n" +msgstr "merge del rebase completato\n" + +msgid "warning: new changesets detected on source branch, not stripping\n" +msgstr "" +"attenzione: nuovi changeset rilevati sulla branch sorgente, non li rimuovo\n" + +msgid "rebase completed\n" +msgstr "rebase completato\n" + +msgid "%d revisions have been skipped\n" +msgstr "%d revisioni sono state saltate\n" + +msgid "" +"Skip commit if collapsing has been required and rev is not the last\n" +" revision, commit otherwise\n" +" " +msgstr "" +"Salta il commit se è stato richiesto di collassare e rev non è l'ultima\n" +" revisione, effettua il commit altrimenti\n" +" " + +msgid " set parents\n" +msgstr " imposta i genitori\n" + +msgid "Rebase a single revision" +msgstr "Rebase di una singola revisione" + +msgid "rebasing %d:%s\n" +msgstr "sto effettuando il rebase di %d:%s\n" + +msgid " future parents are %d and %d\n" +msgstr " i genitori futuri sono %d e %d\n" + +msgid " update to %d:%s\n" +msgstr " aggiorno a %d:%s\n" + +msgid " already in target\n" +msgstr " già su target\n" + +msgid " merge against %d:%s\n" +msgstr " merge con %d:%s\n" + +msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" +msgstr "" +"correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --" +"continue" + +msgid "resuming interrupted rebase\n" +msgstr "sto riprendendo un rebase interrotto\n" + +msgid "no changes, revision %d skipped\n" +msgstr "nessuna modifica, revisione %d saltata\n" + +msgid "next revision set to %s\n" +msgstr "prossima revisione impostata su %s\n" + +msgid "Return the new parent relationship of the revision that will be rebased" +msgstr "" +"Restituisce la nuova relazione di parentela della revisione di cui si farà " +"il rebase" + +msgid "cannot use revision %d as base, result would have 3 parents" +msgstr "" +"non è possibile usare la revisione %d come base, il risultato avrebbe 3 " +"genitori" + +msgid "Update rebased mq patches - finalize and then import them" +msgstr "" +"Aggiorna le patch mq di cui si è effettuato il rebase - le finalizza e poi " +"le importa" + +msgid "revision %d is an mq patch (%s), finalize it.\n" +msgstr "la revisione %d è una patch mq (%s), la finalizzo.\n" + +msgid "import mq patch %d (%s)\n" +msgstr "import della patch mq %d (%s)\n" + +msgid "Store the current status to allow recovery" +msgstr "Salva lo status corrente per consentire il recupero" + +msgid "rebase status stored\n" +msgstr "status del rebase salvato\n" + +msgid "Remove the status files" +msgstr "Rimuove i file dello stato" + +msgid "Restore a previously stored status" +msgstr "Ripristina uno stato precedentemente salvato" + +msgid "rebase status resumed\n" +msgstr "status di rebase recuperato\n" + +msgid "no rebase in progress" +msgstr "nessun rebase in corso" + +msgid "Restore the repository to its original state" +msgstr "Ripristina il repository al suo stato originale" + +msgid "warning: new changesets detected on target branch, not stripping\n" +msgstr "" +"attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n" + +msgid "rebase aborted\n" +msgstr "rebase abortito\n" + +msgid "Define which revisions are going to be rebased and where" +msgstr "Definisce di quali revisioni si farà il rebase e dove" + +msgid "cannot rebase onto an applied mq patch" +msgstr "non è possibile effettuare il rebase su una patch mq applicata" + +msgid "cannot rebase an ancestor" +msgstr "non è possibile effettuare il rebase di un antenato" + +msgid "cannot rebase a descendant" +msgstr "non è possibile effettuare il rebase di un discendente" + +msgid "already working on current\n" +msgstr "sto già lavorando su current\n" + +msgid "already working on the current branch\n" +msgstr "sto già lavorando sulla branch corrente\n" + +msgid "rebase onto %d starting from %d\n" +msgstr "rebase su %d partendo da %d\n" + +msgid "unable to collapse, there is more than one external parent" +msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno" + +msgid "Call rebase after pull if the latter has been invoked with --rebase" +msgstr "Invoca rebase dopo pull se l'ultimo è stato invocato con --rebase" + +msgid "--update and --rebase are not compatible" +msgstr "--update e --rebase non sono compatibili" + +msgid "Replace pull with a decorator to provide --rebase option" +msgstr "Rimpiazza pull con un decoratore per fornire l'opzione --rebase" + +msgid "rebase working directory to branch head" +msgstr "effettua il rebase della directory di lavoro sulla head della branch" + +msgid "keep original revisions" +msgstr "mantiene le revisioni originali" + +msgid "keep original branches" +msgstr "mantiene le branch originali" + +msgid "rebase from a given revision" +msgstr "rebase da una data revisione" + +msgid "rebase from the base of a given revision" +msgstr "rebase dalla base di una data revisione" + +msgid "rebase onto a given revision" +msgstr "rebase su una data revisione" + +msgid "collapse the rebased revisions" +msgstr "collassa le revisioni di cui si effettua il rebase" + +msgid "continue an interrupted rebase" +msgstr "continua un rebase interrotto" + +msgid "abort an interrupted rebase" +msgstr "abortisce un rebase interrotto" + +msgid "" +"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" +msgstr "" +"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" + +msgid "interactive change selection during commit or qrefresh" +msgstr "cambia interattivamente la selezione durante un commit o qrefresh" + +msgid "" +"like patch.iterhunks, but yield different events\n" +"\n" +" - ('file', [header_lines + fromfile + tofile])\n" +" - ('context', [context_lines])\n" +" - ('hunk', [hunk_lines])\n" +" - ('range', (-start,len, +start,len, diffp))\n" +" " +msgstr "" + +msgid "scan lr while predicate holds" +msgstr "scansiona lr fino a quando il predicato vale" + +msgid "" +"patch header\n" +"\n" +" XXX shoudn't we move this to mercurial/patch.py ?\n" +" " +msgstr "" +"intestazione della patch\n" +"\n" +" XXX non dovremmo spostare questo in mercurial/patch.py ?\n" +" " + +msgid "this modifies a binary file (all or nothing)\n" +msgstr "questo modifica un file binario (tutto o niente)\n" + +msgid "this is a binary file\n" +msgstr "questo è un file binario\n" + +msgid "%d hunks, %d lines changed\n" +msgstr "" + +msgid "hunk -> (n+,n-)" +msgstr "hunk -> (n+,n-)" + +msgid "" +"patch hunk\n" +"\n" +" XXX shouldn't we merge this with patch.hunk ?\n" +" " +msgstr "" + +msgid "patch -> [] of hunks " +msgstr "" + +msgid "patch parsing state machine" +msgstr "" + +msgid "Interactively filter patch chunks into applied-only chunks" +msgstr "" + +msgid "" +"fetch next portion from chunks until a 'header' is seen\n" +" NB: header == new-file mark\n" +" " +msgstr "" + +msgid "" +"prompt query, and process base inputs\n" +"\n" +" - y/n for the rest of file\n" +" - y/n for the rest\n" +" - ? (help)\n" +" - q (quit)\n" +"\n" +" else, input is returned to the caller.\n" +" " +msgstr "" + +msgid "[Ynsfdaq?]" +msgstr "[Ynsfdaq?]" + +msgid "y" +msgstr "y" + +msgid "?" +msgstr "?" + +msgid "y - record this change" +msgstr "" + +msgid "s" +msgstr "s" + +msgid "f" +msgstr "f" + +msgid "d" +msgstr "d" + +msgid "a" +msgstr "a" + +msgid "q" +msgstr "q" + +msgid "user quit" +msgstr "" + +msgid "examine changes to %s?" +msgstr "" + +msgid " and " +msgstr " e " + +msgid "record this change to %r?" +msgstr "" + +#, fuzzy +msgid "" +"interactively select changes to commit\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be candidates for recording.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" You will be prompted for whether to record changes to each\n" +" modified file, and for files with multiple changes, for each\n" +" change to use. For each query, the following responses are\n" +" possible:\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" +msgstr "" +"seleziona interattivamente le modifiche di cui eseguire il commit\n" +"\n" +" Se viene omesso un elenco di file, tutte le modifiche riportate da \"hg " +"status\"\n" +" saranno candidati per la registrazione.\n" +"\n" +" Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n" +"\n" +" You will be prompted for whether to record changes to each\n" +" modified file, and for files with multiple changes, for each\n" +" change to use. For each query, the following responses are\n" +" possible:\n" +"\n" +" y - registra questa modifica\n" +" n - salta questa modifica\n" +"\n" +" s - salta le modifiche rimanenti di questo file\n" +" f - registra le modifiche rimanenti di questo file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" + +msgid "" +"interactively record a new patch\n" +"\n" +" see 'hg help qnew' & 'hg help record' for more information and usage\n" +" " +msgstr "" + +msgid "'mq' extension not loaded" +msgstr "estensione 'mq' non caricata" + +msgid "running non-interactively, use commit instead" +msgstr "" + +msgid "" +"This is generic record driver.\n" +"\n" +" It's job is to interactively filter local changes, and accordingly\n" +" prepare working dir into a state, where the job can be delegated to\n" +" non-interactive commit command such as 'commit' or 'qrefresh'.\n" +"\n" +" After the actual job is done by non-interactive command, working " +"dir\n" +" state is restored to original.\n" +"\n" +" In the end we'll record intresting changes, and everything else will " +"be\n" +" left in place, so the user can continue his work.\n" +" " +msgstr "" + +msgid "no changes to record\n" +msgstr "nessuna modifica da registrare\n" + +msgid "backup %r as %r\n" +msgstr "backup %r come %r\n" + +msgid "applying patch\n" +msgstr "sto applicando una patch\n" + +msgid "patch failed to apply" +msgstr "" + +msgid "restoring %r to %r\n" +msgstr "" + +msgid "hg record [OPTION]... [FILE]..." +msgstr "hg record [OPZIONI]... [FILE]..." + +msgid "hg qrecord [OPTION]... PATCH [FILE]..." +msgstr "hg qrecord [OPZIONI]... PATCH [FILE]..." + +msgid "" +"patch transplanting tool\n" +"\n" +"This extension allows you to transplant patches from another branch.\n" +"\n" +"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" +"from a changeset hash to its hash in the source repository.\n" +msgstr "" + +msgid "" +"returns True if a node is already an ancestor of parent\n" +" or has already been transplanted" +msgstr "" + +msgid "apply the revisions in revmap one by one in revision order" +msgstr "" + +msgid "skipping already applied revision %s\n" +msgstr "" + +msgid "skipping merge changeset %s:%s\n" +msgstr "" + +msgid "%s merged at %s\n" +msgstr "" + +msgid "%s transplanted to %s\n" +msgstr "" + +msgid "arbitrarily rewrite changeset before applying it" +msgstr "" + +msgid "filtering %s\n" +msgstr "sto filtrando %s\n" + +msgid "filter failed" +msgstr "filtraggio fallito" + +msgid "apply the patch in patchfile to the repository as a transplant" +msgstr "" + +msgid "can only omit patchfile if merging" +msgstr "" + +msgid "%s: empty changeset" +msgstr "%s: changeset vuoto" + +msgid "Fix up the merge and run hg transplant --continue" +msgstr "" + +msgid "recover last transaction and apply remaining changesets" +msgstr "" + +msgid "%s transplanted as %s\n" +msgstr "%s trapiantato come %s\n" + +msgid "commit working directory using journal metadata" +msgstr "" + +msgid "transplant log file is corrupt" +msgstr "" + +msgid "working dir not at transplant parent %s" +msgstr "" + +msgid "commit failed" +msgstr "commit fallito" + +msgid "journal changelog metadata for later recover" +msgstr "" + +msgid "remove changelog journal" +msgstr "" + +msgid "interactively transplant changesets" +msgstr "" + +msgid "apply changeset? [ynmpcq?]:" +msgstr "applicare il changeset? [ynmpcq?]:" + +msgid "" +"transplant changesets from another branch\n" +"\n" +" Selected changesets will be applied on top of the current working\n" +" directory with the log of the original changeset. If --log is\n" +" specified, log messages will have a comment appended of the form:\n" +"\n" +" (transplanted from CHANGESETHASH)\n" +"\n" +" You can rewrite the changelog message with the --filter option.\n" +" Its argument will be invoked with the current changelog message\n" +" as $1 and the patch as $2.\n" +"\n" +" If --source is specified, selects changesets from the named\n" +" repository. If --branch is specified, selects changesets from the\n" +" branch holding the named revision, up to that revision. If --all\n" +" is specified, all changesets on the branch will be transplanted,\n" +" otherwise you will be prompted to select the changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected branch\n" +" (up to the named revision) onto your current working directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as\n" +" merge changesets. You will not be prompted to transplant any\n" +" ancestors of a merged transplant, and you can merge descendants\n" +" of them normally instead of transplanting them.\n" +"\n" +" If no merges or revisions are provided, hg transplant will start\n" +" an interactive changeset browser.\n" +"\n" +" If a changeset application fails, you can fix the merge by hand and\n" +" then resume where you left off by calling hg transplant --continue.\n" +" " +msgstr "" + +msgid "--continue is incompatible with branch, all or merge" +msgstr "" + +msgid "no source URL, branch tag or revision list provided" +msgstr "" + +msgid "--all requires a branch revision" +msgstr "" + +msgid "--all is incompatible with a revision list" +msgstr "" + +msgid "no revision checked out" +msgstr "" + +msgid "outstanding uncommitted merges" +msgstr "" + +msgid "outstanding local changes" +msgstr "" + +msgid "pull patches from REPOSITORY" +msgstr "" + +msgid "pull patches from branch BRANCH" +msgstr "" + +msgid "pull all changesets up to BRANCH" +msgstr "" + +msgid "skip over REV" +msgstr "" + +msgid "merge at REV" +msgstr "" + +msgid "append transplant info to log message" +msgstr "" + +msgid "continue last transplant session after repair" +msgstr "" + +msgid "filter changesets through FILTER" +msgstr "" + +msgid "" +"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "" + +msgid "" +"allow to use MBCS path with problematic encoding.\n" +"\n" +"Some MBCS encodings are not good for some path operations\n" +"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" +"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" +"encoding\". This extension can be used to fix the issue with those\n" +"encodings by wrapping some functions to convert to unicode string\n" +"before path operation.\n" +"\n" +"This extension is usefull for:\n" +" * Japanese Windows users using shift_jis encoding.\n" +" * Chinese Windows users using big5 encoding.\n" +" * All users who use a repository with one of problematic encodings\n" +" on case-insensitive file system.\n" +"\n" +"This extension is not needed for:\n" +" * Any user who use only ascii chars in path.\n" +" * Any user who do not use any of problematic encodings.\n" +"\n" +"Note that there are some limitations on using this extension:\n" +" * You should use single encoding in one repository.\n" +" * You should set same encoding for the repository by locale or HGENCODING.\n" +"\n" +"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" +"\n" +" [extensions]\n" +" hgext.win32mbcs =\n" +"\n" +"Path encoding conversion are done between unicode and util._encoding\n" +"which is decided by mercurial from current locale setting or HGENCODING.\n" +"\n" +msgstr "" + +msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgstr "" + +msgid "[win32mbcs] cannot activate on this platform.\n" +msgstr "" + +msgid "[win32mbcs] activated with encoding: %s\n" +msgstr "" + +msgid "" +"WARNING: %s already has %s line endings\n" +"and does not need EOL conversion by the win32text plugin.\n" +"Before your next commit, please reconsider your encode/decode settings in \n" +"Mercurial.ini or %s.\n" +msgstr "" + +msgid "Attempt to commit or push text file(s) using %s line endings\n" +msgstr "" + +msgid "in %s: %s\n" +msgstr "" + +msgid "" +"\n" +"To prevent this mistake in your local repository,\n" +"add to Mercurial.ini or .hg/hgrc:\n" +"\n" +"[hooks]\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s\n" +"\n" +"and also consider adding:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = %sencode:\n" +"[decode]\n" +"** = %sdecode:\n" +msgstr "" + +msgid "" +"zeroconf support for mercurial repositories\n" +"\n" +"Zeroconf enabled repositories will be announced in a network without the " +"need\n" +"to configure a server or a service. They can be discovered without knowing\n" +"their actual IP address.\n" +"\n" +"To use the zeroconf extension add the following entry to your hgrc file:\n" +"\n" +"[extensions]\n" +"hgext.zeroconf =\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\" in " +"your\n" +"repository.\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\".\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" +msgstr "" + +msgid "" +"add the specified files on the next commit\n" +"\n" +" Schedule files to be version controlled and added to the repository.\n" +"\n" +" The files will be added to the repository at the next commit. To\n" +" undo an add before that, see hg revert.\n" +"\n" +" If no names are given, add all files in the repository.\n" +" " +msgstr "" + +msgid "adding %s\n" +msgstr "" + +msgid "" +"add all new files, delete all missing files\n" +"\n" +" Add all new files and remove all missing files from the repository.\n" +"\n" +" New files are ignored if they match any of the patterns in .hgignore. " +"As\n" +" with add, these changes take effect at the next commit.\n" +"\n" +" Use the -s option to detect renamed files. With a parameter > 0,\n" +" this compares every removed file with every added file and records\n" +" those similar enough as renames. This option takes a percentage\n" +" between 0 (disabled) and 100 (files must be identical) as its\n" +" parameter. Detecting renamed files this way can be expensive.\n" +" " +msgstr "" + +msgid "similarity must be a number" +msgstr "" + +msgid "similarity must be between 0 and 100" +msgstr "" + +msgid "" +"show changeset information per file line\n" +"\n" +" List changes in files, showing the revision id responsible for each " +"line\n" +"\n" +" This command is useful to discover who did a change or when a change " +"took\n" +" place.\n" +"\n" +" Without the -a option, annotate will avoid processing files it\n" +" detects as binary. With -a, annotate will generate an annotation\n" +" anyway, probably with undesirable results.\n" +" " +msgstr "" + +msgid "at least one file name or pattern required" +msgstr "" + +msgid "at least one of -n/-c is required for -l" +msgstr "" + +msgid "%s: binary file\n" +msgstr "" + +msgid "" +"create unversioned archive of a repository revision\n" +"\n" +" By default, the revision used is the parent of the working\n" +" directory; use \"-r\" to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use \"-t\". Valid\n" +" types are:\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" +"\n" +" The exact name of the destination archive or directory is given\n" +" using a format string; see \"hg help export\" for details.\n" +"\n" +" Each member added to an archive file has a directory prefix\n" +" prepended. Use \"-p\" to specify a format string for the prefix.\n" +" The default is the basename of the archive, with suffixes removed.\n" +" " +msgstr "" + +msgid "no working directory: please specify a revision" +msgstr "" + +msgid "repository root cannot be destination" +msgstr "" + +msgid "cannot archive plain files to stdout" +msgstr "" + +#, fuzzy +msgid "" +"reverse effect of earlier changeset\n" +"\n" +" Commit the backed out changes as a new changeset. The new\n" +" changeset is a child of the backed out changeset.\n" +"\n" +" If you back out a changeset other than the tip, a new head is\n" +" created. This head will be the new tip and you should merge this\n" +" backout changeset with another head (current one by default).\n" +"\n" +" The --merge option remembers the parent of the working directory\n" +" before starting the backout, then merges the new head with that\n" +" changeset afterwards. This saves you from doing the merge by\n" +" hand. The result of this merge is not committed, as for a normal\n" +" merge.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"reverse effect of earlier changeset\n" +"\n" +" Commit the backed out changes as a new changeset. The new\n" +" changeset is a child of the backed out changeset.\n" +"\n" +" If you back out a changeset other than the tip, a new head is\n" +" created. This head will be the new tip and you should merge this\n" +" backout changeset with another head (current one by default).\n" +"\n" +" The --merge option remembers the parent of the working directory\n" +" before starting the backout, then merges the new head with that\n" +" changeset afterwards. This saves you from doing the merge by\n" +" hand. The result of this merge is not committed, as for a normal\n" +" merge.\n" +"\n" +" Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n" +" " + +msgid "please specify just one revision" +msgstr "" + +msgid "please specify a revision to backout" +msgstr "" + +msgid "cannot back out change on a different branch" +msgstr "" + +msgid "cannot back out a change with no parents" +msgstr "" + +msgid "cannot back out a merge changeset without --parent" +msgstr "" + +msgid "%s is not a parent of %s" +msgstr "" + +msgid "cannot use --parent on non-merge changeset" +msgstr "" + +msgid "Backed out changeset %s" +msgstr "" + +msgid "changeset %s backs out changeset %s\n" +msgstr "" + +msgid "merging with changeset %s\n" +msgstr "" + +msgid "the backout changeset is a new head - do not forget to merge\n" +msgstr "" + +msgid "(use \"backout --merge\" if you want to auto-merge)\n" +msgstr "" + +msgid "" +"subdivision search of changesets\n" +"\n" +" This command helps to find changesets which introduce problems.\n" +" To use, mark the earliest changeset you know exhibits the problem\n" +" as bad, then mark the latest changeset which is free from the\n" +" problem as good. Bisect will update your working directory to a\n" +" revision for testing (unless the --noupdate option is specified).\n" +" Once you have performed tests, mark the working directory as bad\n" +" or good and bisect will either update to another candidate changeset\n" +" or announce that it has found the bad revision.\n" +"\n" +" As a shortcut, you can also use the revision argument to mark a\n" +" revision as good or bad without checking it out first.\n" +"\n" +" If you supply a command it will be used for automatic bisection. Its " +"exit\n" +" status will be used as flag to mark revision as bad or good. In case " +"exit\n" +" status is 0 the revision is marked as good, 125 - skipped, 127 (command " +"not\n" +" found) - bisection will be aborted and any other status bigger than 0 " +"will\n" +" mark revision as bad.\n" +" " +msgstr "" + +msgid "The first %s revision is:\n" +msgstr "" + +msgid "Due to skipped revisions, the first %s revision could be any of:\n" +msgstr "" + +msgid "cannot bisect (no known good revisions)" +msgstr "" + +msgid "cannot bisect (no known bad revisions)" +msgstr "" + +msgid "(use of 'hg bisect <cmd>' is deprecated)\n" +msgstr "" + +msgid "incompatible arguments" +msgstr "" + +msgid "failed to execute %s" +msgstr "" + +msgid "%s killed" +msgstr "" + +msgid "Changeset %s: %s\n" +msgstr "" + +msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgstr "" + +msgid "" +"set or show the current branch name\n" +"\n" +" With no argument, show the current branch name. With one argument,\n" +" set the working directory branch name (the branch does not exist in\n" +" the repository until the next commit).\n" +"\n" +" Unless --force is specified, branch will not let you set a\n" +" branch name that shadows an existing branch.\n" +"\n" +" Use --clean to reset the working directory branch to that of the\n" +" parent of the working directory, negating a previous branch change.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" + +msgid "reset working directory to branch %s\n" +msgstr "" + +msgid "a branch of the same name already exists (use --force to override)" +msgstr "" + +msgid "marked working directory as branch %s\n" +msgstr "" + +msgid "" +"list repository named branches\n" +"\n" +" List the repository's named branches, indicating which ones are\n" +" inactive. If active is specified, only show active branches.\n" +"\n" +" A branch is considered active if it contains repository heads.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" + +msgid "" +"create a changegroup file\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" found in the other repository.\n" +"\n" +" If no destination repository is specified the destination is\n" +" assumed to have all the nodes specified by one or more --base\n" +" parameters. To create a bundle containing all changesets, use\n" +" --all (or --base null). To change the compression method applied,\n" +" use the -t option (by default, bundles are compressed using bz2).\n" +"\n" +" The bundle file can then be transferred using conventional means and\n" +" applied to another repository with the unbundle or pull command.\n" +" This is useful when direct push and pull are not available or when\n" +" exporting an entire repository is undesirable.\n" +"\n" +" Applying bundles preserves all changeset contents including\n" +" permissions, copy/rename information, and revision history.\n" +" " +msgstr "" + +msgid "--base is incompatible with specifiying a destination" +msgstr "" + +msgid "unknown bundle type specified with --type" +msgstr "" + +msgid "" +"output the current or given revision of files\n" +"\n" +" Print the specified files as they were at the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are the same as\n" +" for the export command, with the following additions:\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repo root\n" +" %p root-relative path name of file being printed\n" +" " +msgstr "" + +msgid "" +"make a copy of an existing repository\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" The location of the source is added to the new repository's\n" +" .hg/hgrc file, as the default to be used for future pulls.\n" +"\n" +" For efficiency, hardlinks are used for cloning whenever the source\n" +" and destination are on the same filesystem (note this applies only\n" +" to the repository data, not to the checked out files). Some\n" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\n" +" using full hardlinks with\n" +"\n" +" $ cp -al REPO REPOCLONE\n" +"\n" +" This is the fastest way to clone, but it is not always safe. The\n" +" operation is not atomic (making sure REPO is not modified during\n" +" the operation is up to you) and you have to make sure your editor\n" +" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" If you use the -r option to clone up to a specific revision, no\n" +" subsequent revisions will be present in the cloned repository.\n" +" This option implies --pull, even on local repositories.\n" +"\n" +" If the -U option is used, the new clone will contain only a repository\n" +" (.hg) and no working copy (the working copy parent is the null " +"revision).\n" +"\n" +" See pull for valid source format details.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination, but no\n" +" .hg/hgrc and working directory will be created on the remote side.\n" +" Look at the help text for the pull command for important details\n" +" about ssh:// URLs.\n" +" " +msgstr "" +"crea una copia di un repository esistente\n" +"\n" +" Crea una copia di un repository esistente in una nuova directory.\n" +"\n" +" Se non viene specificato nessun nome di directory destinazione, di\n" +" default viene usata la directory base della sorgente.\n" +"\n" +" La posizione della sorgente viene aggiunta al file .hg/hgrc del\n" +" nuovo repository, come default da usare per pull futuri.\n" +"\n" +" Per efficienza, si usano hardlink per clonare ogni volta che la\n" +" sorgente e la destinazione sono sullo stesso filesystem (notare\n" +" che questo vale per i dati del repository, per per i file di cui\n" +" si è fatto il check out). Alcuni filesystem, tipo AFS, non\n" +" implementano correttamente gli hardlink, ma non riportano errori.\n" +" In questi casi, usare l'opzione --pull per evitare gli hardlink.\n" +"\n" +" In alcuni casi, è possibile clonare repository e i file di cui si\n" +" è fatto il check out usando hardlink completi con\n" +"\n" +" $ cp -al REPO REPOCLONE\n" +"\n" +" Questo è il modo più veloce per clonare, ma non è sempre sicuro.\n" +" L'operazione non è atomica (spetta all'utente assicurarsi che REPO\n" +" non venga modificato durante l'operazione) e bisogna assicurarsi\n" +" che l'editor usato spezzi gli hardlink (Emacs e i principali tool\n" +" del Kernel Linux lo fanno). Inoltre, questo non è compatibile con\n" +" alcune estensioni che mettono i loro metadati sotto la directory\n" +" .hg, tipo mq.\n" +"\n" +" Se viene usata l'opzione -r per clonare fino ad una revisione\n" +" specifica, nessuna revisione seguente sarà presente nel repository\n" +" clonato. Questa opzione implica --pull, anche per repository\n" +" locali.\n" +"\n" +" Se viene usata l'opzione -U, il nuovo clone conterrà solo un\n" +" repository (.hg) e nessuna copia di lavoro (il genitore della\n" +" copia di lavoro è la revisione nulla).\n" +"\n" +" Vedere pull per dettagli sui formati di sorgenti valide.\n" +"\n" +" E' possibile specificare un URL ssh:// come destinazione, ma\n" +" nessun .hg/hgrc e directory di lavoro verranno creati sul lato\n" +" remoto. Riferirsi al testo di aiuto per il comando pull per\n" +" dettagli importanti riguardo gli URL ssh://.\n" +" " + +msgid "" +"commit the specified files or all outstanding changes\n" +"\n" +" Commit changes to the given files into the repository.\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be committed.\n" +"\n" +" If you are committing the result of a merge, do not provide any\n" +" file names or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is started to\n" +" enter a message.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"effettua il commit dei file specificati o di tutte le modifiche pendenti\n" +"\n" +" Effettua il commit delle modifiche sui file dati nel repository.\n" +"\n" +" Se si omette un elenco di file, si farà il commit di tutte le\n" +" modifiche riportate da \"hg status\".\n" +"\n" +" Se si sta effettuando il commit del risultato di un merge, non\n" +" fornire nessun nome di file o filtri -I/-X.\n" +"\n" +" Se non è specificato nessun messaggio di commit, l'editor\n" +" configurato viene lanciato per inserire un messaggio.\n" +"\n" +" Vedere 'hg help dates' per un elenco dei formati validi per\n" +" -d/--date.\n" +" " + +msgid "created new head\n" +msgstr "creata una nuova head\n" + +msgid "committed changeset %d:%s\n" +msgstr "effettuato il commit del changeset %d:%s\n" + +msgid "" +"mark files as copied for the next commit\n" +"\n" +" Mark dest as having copies of source files. If dest is a\n" +" directory, copies are put in that directory. If dest is a file,\n" +" there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a copy\n" +" before that, see hg revert.\n" +" " +msgstr "" + +msgid "find the ancestor revision of two revisions in a given index" +msgstr "" + +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "Non esiste alcun repository Mercurial qui (.hg non trovata)" + +msgid "either two or three arguments required" +msgstr "due o tre argomenti sono richiesti" + +msgid "returns the completion list associated with the given command" +msgstr "restituisce l'elenco di completamento associato al dato comando" + +msgid "rebuild the dirstate as it would look like for the given revision" +msgstr "" + +msgid "validate the correctness of the current dirstate" +msgstr "" + +msgid "%s in state %s, but not in manifest1\n" +msgstr "%s è nello state %s, ma non nel manifest1\n" + +msgid "%s in state %s, but also in manifest1\n" +msgstr "%s è nello state %s, ma anche nel manifest1\n" + +msgid "%s in state %s, but not in either manifest\n" +msgstr "%s è nello state %s, ma non in uno dei manifesti\n" + +msgid "%s in manifest1, but listed as state %s" +msgstr "" + +msgid ".hg/dirstate inconsistent with current parent's manifest" +msgstr "" + +msgid "" +"show combined config settings from all hgrc files\n" +"\n" +" With no args, print names and values of all config items.\n" +"\n" +" With one arg of the form section.name, print just the value of\n" +" that config item.\n" +"\n" +" With multiple args, print names and values of all config items\n" +" with matching section names." +msgstr "" + +msgid "only one config item permitted" +msgstr "" + +msgid "" +"manually set the parents of the current working directory\n" +"\n" +" This is useful for writing repository conversion tools, but should\n" +" be used with care.\n" +" " +msgstr "" + +msgid "show the contents of the current dirstate" +msgstr "" + +msgid "copy: %s -> %s\n" +msgstr "" + +msgid "dump the contents of a data file revision" +msgstr "" + +msgid "invalid revision identifier %s" +msgstr "" + +msgid "parse and display a date" +msgstr "" + +msgid "dump the contents of an index file" +msgstr "" + +msgid "dump an index DAG as a .dot file" +msgstr "" + +msgid "test Mercurial installation" +msgstr "" + +msgid "Checking encoding (%s)...\n" +msgstr "" + +msgid " (check that your locale is properly set)\n" +msgstr "" + +msgid "Checking extensions...\n" +msgstr "" + +msgid " One or more extensions could not be found" +msgstr "" + +msgid " (check that you compiled the extensions)\n" +msgstr "" + +msgid "Checking templates...\n" +msgstr "" + +msgid " (templates seem to have been installed incorrectly)\n" +msgstr "" + +msgid "Checking patch...\n" +msgstr "" + +msgid " patch call failed:\n" +msgstr "" + +msgid " unexpected patch output!\n" +msgstr "" + +msgid " patch test failed!\n" +msgstr "" + +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://www.selenic." +"com/mercurial/bts\n" +msgstr "" + +msgid "Checking commit editor...\n" +msgstr "" + +msgid " No commit editor set and can't find vi in PATH\n" +msgstr "" + +msgid " (specify a commit editor in your .hgrc file)\n" +msgstr "" + +msgid " Can't find editor '%s' in PATH\n" +msgstr "" + +msgid "Checking username...\n" +msgstr "" + +msgid " (specify a username in your .hgrc file)\n" +msgstr "" + +msgid "No problems detected\n" +msgstr "" + +msgid "%s problems detected, please check your install!\n" +msgstr "" + +msgid "dump rename information" +msgstr "" + +msgid "%s renamed from %s:%s\n" +msgstr "" + +msgid "%s not renamed\n" +msgstr "" + +msgid "show how files match on given patterns" +msgstr "" + +msgid "" +"diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files.\n" +"\n" +" Differences between files are shown using the unified diff format.\n" +"\n" +" NOTE: diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first parent\n" +" changeset if no revisions are specified.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent.\n" +"\n" +" Without the -a option, diff will avoid generating diffs of files\n" +" it detects as binary. With -a, diff will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +" " +msgstr "" + +msgid "cannot specify --rev and --change at the same time" +msgstr "" + +msgid "" +"dump the header and diffs for one or more changesets\n" +"\n" +" Print the changeset header and diffs for one or more revisions.\n" +"\n" +" The information shown in the changeset header is: author,\n" +" changeset hash, parent(s) and commit comment.\n" +"\n" +" NOTE: export may generate unexpected diff output for merge changesets,\n" +" as it will compare the merge changeset against its first parent only.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are as follows:\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" +"\n" +" Without the -a option, export will avoid generating diffs of files\n" +" it detects as binary. With -a, export will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the second\n" +" parent. It can be useful to review a merge.\n" +" " +msgstr "" + +msgid "export requires at least one changeset" +msgstr "" + +msgid "exporting patches:\n" +msgstr "" + +msgid "exporting patch:\n" +msgstr "" + +msgid "" +"search for a pattern in specified files and revisions\n" +"\n" +" Search revisions of files for a regular expression.\n" +"\n" +" This command behaves differently than Unix grep. It only accepts\n" +" Python/Perl regexps. It searches repository history, not the\n" +" working directory. It always prints the revision number in which\n" +" a match appears.\n" +"\n" +" By default, grep only prints output for the first revision of a\n" +" file in which it finds a match. To get it to print every revision\n" +" that contains a change in match status (\"-\" for a match that\n" +" becomes a non-match, or \"+\" for a non-match that becomes a match),\n" +" use the --all flag.\n" +" " +msgstr "" + +msgid "grep: invalid match pattern: %s\n" +msgstr "" + +msgid "" +"show current repository heads or show branch heads\n" +"\n" +" With no arguments, show all repository head changesets.\n" +"\n" +" If branch or revisions names are given this will show the heads of\n" +" the specified branches or the branches those revisions are tagged\n" +" with.\n" +"\n" +" Repository \"heads\" are changesets that don't have child\n" +" changesets. They are where development generally takes place and\n" +" are the usual targets for update and merge operations.\n" +"\n" +" Branch heads are changesets that have a given branch tag, but have\n" +" no child changesets with that tag. They are usually where\n" +" development on the given branch takes place.\n" +" " +msgstr "" + +msgid "no changes on branch %s containing %s are reachable from %s\n" +msgstr "" + +msgid "no changes on branch %s are reachable from %s\n" +msgstr "" + +msgid "" +"show help for a given topic or a help overview\n" +"\n" +" With no arguments, print a list of commands and short help.\n" +"\n" +" Given a topic, extension, or command name, print help for that topic." +msgstr "" +"mostra l'aiuto per un dato argomento o una panoramica d'aiuto\n" +"\n" +" Senza argomenti stampa un elenco dei comandi ed un breve aiuto.\n" +"\n" +" Dato un argomento, estensione o nome di comando, stampa l'aiuto\n" +" per tale argomento." + +msgid "global options:" +msgstr "opzioni globali:" + +msgid "use \"hg help\" for the full list of commands" +msgstr "usare \"hg help\" per l'elenco completo dei comandi" + +msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" +msgstr "" +"usare \"hg help\" per la lista completa dei comandi oppure \"hg -v\" per i " +"dettagli" + +msgid "use \"hg -v help%s\" to show aliases and global options" +msgstr "usare \"hg -v help%s\" per mostrare gli alias e le opzioni globali" + +msgid "use \"hg -v help %s\" to show global options" +msgstr "usare \"hg -v help %s\" per mostrare le opzioni globali" + +msgid "" +"list of commands:\n" +"\n" +msgstr "" +"elenco dei comandi:\n" +"\n" + +msgid "" +"\n" +"aliases: %s\n" +msgstr "" +"\n" +"alias: %s\n" + +msgid "(no help text available)" +msgstr "(nessun testo di aiuto disponibile)" + +msgid "options:\n" +msgstr "opzioni:\n" + +msgid "no commands defined\n" +msgstr "nessun comando definito\n" + +msgid "" +"\n" +"enabled extensions:\n" +"\n" +msgstr "" +"\n" +"estensioni abilitate:\n" +"\n" + +msgid " %s %s\n" +msgstr " %s %s\n" + +msgid "no help text available" +msgstr "nessun testo di aiuto disponibile" + +msgid "%s extension - %s\n" +msgstr "estensione %s - %s\n" + +msgid "Mercurial Distributed SCM\n" +msgstr "Mercurial SCM Distribuito\n" + +msgid "" +"basic commands:\n" +"\n" +msgstr "" +"comandi base:\n" +"\n" + +msgid " (default: %s)" +msgstr " (default: %s)" + +msgid "" +"\n" +"additional help topics:\n" +"\n" +msgstr "" +"\n" +"argomenti di aiuto aggiuntivi:\n" +"\n" + +msgid "" +"identify the working copy or specified revision\n" +"\n" +" With no revision, print a summary of the current state of the repo.\n" +"\n" +" With a path, do a lookup in another repository.\n" +"\n" +" This summary identifies the repository state using one or two parent\n" +" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" +" in the working directory, a list of tags for this revision and a branch\n" +" name for non-default branches.\n" +" " +msgstr "" +"identifica la copia di lavoro o una revisione specifica\n" +"\n" +" Con nessuna revisione, stampa un sommario dello stato corrente del\n" +" repository.\n" +"\n" +" Con un percorso, effettua una ricerca in un altro repository.\n" +"\n" +" Questo sommario identifica lo stato del repository usando uno o\n" +" due hash dei genitori, seguito da un \"+\" se ci sono modifiche di\n" +" cui non si è eseguito il commit nella directory di lavoro, un\n" +" elenco di tag per questa revisione e un nome di branch per branch\n" +" non-default.\n" +" " + +msgid "" +"import an ordered set of patches\n" +"\n" +" Import a list of patches and commit them individually.\n" +"\n" +" If there are outstanding changes in the working directory, import\n" +" will abort unless given the -f flag.\n" +"\n" +" You can import a patch straight from a mail message. Even patches\n" +" as attachments work (body part must be type text/plain or\n" +" text/x-patch to be used). From and Subject headers of email\n" +" message are used as default committer and commit message. All\n" +" text/plain body parts before first diff are added to commit\n" +" message.\n" +"\n" +" If the imported patch was generated by hg export, user and description\n" +" from patch override values from message headers and body. Values\n" +" given on command line with -m and -u override these.\n" +"\n" +" If --exact is specified, import will set the working directory\n" +" to the parent of each patch before applying it, and will abort\n" +" if the resulting changeset has a different ID than the one\n" +" recorded in the patch. This may happen due to character set\n" +" problems or other deficiencies in the text patch format.\n" +"\n" +" With --similarity, hg will attempt to discover renames and copies\n" +" in the patch in the same way as 'addremove'.\n" +"\n" +" To read a patch from standard input, use patch name \"-\".\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"importa un insieme ordinato di patch\n" +"\n" +" Importa un elenco di patch e ne effettua il commit\n" +" individualmente.\n" +"\n" +" Se ci sono modifiche pendenti nella directory di lavoro,\n" +" l'importazione abortirà a meno che non si usi il flag -f.\n" +"\n" +" E' possibile importare una patch direttamente da un messaggio\n" +" mail. Anche le patch come allegato funzionano (il corpo deve\n" +" essere di tipo text/plain o deve essere usato text/x-patch). Le\n" +" intestazioni Da e Soggetto della mail sono usate come committente\n" +" e messaggio di commit di default. Tutte le parti del corpo\n" +" text/plain antecedenti il primo diff sono aggiunte al messaggio di\n" +" commit.\n" +"\n" +" Se la patch importata è stata generata da hg export, l'utente e la\n" +" descrizione dalla patch rimpiazzano i valori dal corpo e\n" +" dall'intestazione del messaggio. I valori forniti dalla riga di\n" +" comando con -m e -u rimpiazzano questi.\n" +"\n" +" Se viene specificato --exact, l'importazione imposterà la\n" +" directory di lavoro al genitore di ogni patch prima di applicarla,\n" +" e abortirà se il changeset risultante avrà un ID differente\n" +" rispetto a quello registrato nella patch Questo potrebbe capitare\n" +" a causa di problemi del set di caratteri o altre carenze nel\n" +" formato della patch testuale.\n" +"\n" +" Con --similarity, hg tenterà di scoprire le rinomine e le copie\n" +" nella patch allo stesso modo di 'addremove'.\n" +"\n" +" Per leggere una patch dallo standard input, usare come nome della\n" +" patch \"-\". Vedere 'hg help dates' per un elenco dei formati validi\n" +" per -d/--date.\n" +" " + +msgid "applying patch from stdin\n" +msgstr "sto applicando patch dallo stdin\n" + +msgid "no diffs found" +msgstr "nessun diff trovato" + +msgid "" +"message:\n" +"%s\n" +msgstr "" +"messaggio:\n" +"%s\n" + +msgid "not a mercurial patch" +msgstr "non è una patch di mercurial" + +msgid "patch is damaged or loses information" +msgstr "la patch è danneggiata o perde informazioni" + +msgid "" +"show new changesets found in source\n" +"\n" +" Show new changesets found in the specified path/URL or the default\n" +" pull location. These are the changesets that would be pulled if a pull\n" +" was requested.\n" +"\n" +" For remote repository, using --bundle avoids downloading the changesets\n" +" twice if the incoming is followed by a pull.\n" +"\n" +" See pull for valid source format details.\n" +" " +msgstr "" +"mostra i nuovi changeset trovati nella sorgente\n" +"\n" +" Mostra i nuovi changeset trovati nel percorso/URL specificato o\n" +" nella posizione di pull di default. Questi sono i changeset di cui\n" +" si effettuerebbe il pull se questo venisse richiesto.\n" +"\n" +" Per repository remoti, usare --bundle evita di scaricare due volte\n" +" i changeset se incoming è seguito da un pull.\n" +"\n" +" Vedere pull per dettagli sui formati di sorgenti validi.\n" +" " + +msgid "" +"create a new repository in the given directory\n" +"\n" +" Initialize a new repository in the given directory. If the given\n" +" directory does not exist, it is created.\n" +"\n" +" If no directory is given, the current directory is used.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination.\n" +" Look at the help text for the pull command for important details\n" +" about ssh:// URLs.\n" +" " +msgstr "" +"crea un nuovo repository nella directory data\n" +"\n" +" Inizializza un nuovo repository nella directory data. Se tale\n" +" directory non esiste la crea.\n" +"\n" +" Se nessuna directory è specificata si usa la directory corrente.\n" +"\n" +" E' possibile specificare un URL ssh:// come destinazione.\n" +" Controllare il testo di aiuto per il comando pull per importanti\n" +" dettagli riguardanti gli URL ssh://.\n" +" " + +msgid "" +"locate files matching specific patterns\n" +"\n" +" Print all files under Mercurial control whose names match the\n" +" given patterns.\n" +"\n" +" This command searches the entire repository by default. To search\n" +" just the current directory and its subdirectories, use\n" +" \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints all file\n" +" names.\n" +"\n" +" If you want to feed the output of this command into the \"xargs\"\n" +" command, use the \"-0\" option to both this command and \"xargs\".\n" +" This will avoid the problem of \"xargs\" treating single filenames\n" +" that contain white space as multiple filenames.\n" +" " +msgstr "" +"trova file corrispondenti a pattern specificati\n" +"\n" +" Stampa tutti i file sotto il controllo di Mercurial il cui nome\n" +" corrisponde ai dati pattern.\n" +"\n" +" Questo comando cerca nell'intero repository di default. Per\n" +" ricercare solo nella directory corrente e le sue sottodirectory,\n" +" usare \"--include .\".\n" +"\n" +" Se non sono forniti pattern, questo comando stampa il nome di\n" +" tutti i file.\n" +"\n" +" Se si desidera fornire l'output di questo comando al comando\n" +" \"xargs\", usare l'opzione \"-0\" sia per questo comando sia per\n" +" \"xargs\". Questo eviterà il problema per cui \"xargs\" tratta\n" +" filename singoli che contengono spazi bianchi come filename\n" +" multipli.\n" +" " + +#, fuzzy +msgid "" +"show revision history of entire repository or files\n" +"\n" +" Print the revision history of the specified files or the entire\n" +" project.\n" +"\n" +" File history is shown without following rename or copy history of\n" +" files. Use -f/--follow with a file name to follow history across\n" +" renames and copies. --follow without a file name will only show\n" +" ancestors or descendants of the starting revision. --follow-first\n" +" only follows the first parent of merge revisions.\n" +"\n" +" If no revision range is specified, the default is tip:0 unless\n" +" --follow is set, in which case the working directory parent is\n" +" used as the starting revision.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" By default this command outputs: changeset id and hash, tags,\n" +" non-trivial parents, user, date and time, and a summary for each\n" +" commit. When the -v/--verbose switch is used, the list of changed\n" +" files and full commit message is shown.\n" +"\n" +" NOTE: log -p may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only. Also, the files: list will only reflect files\n" +" that are different from BOTH parents.\n" +"\n" +" " +msgstr "" +"show revision history of entire repository or files\n" +"\n" +" Print the revision history of the specified files or the entire\n" +" project.\n" +"\n" +" File history is shown without following rename or copy history of\n" +" files. Use -f/--follow with a file name to follow history across\n" +" renames and copies. --follow without a file name will only show\n" +" ancestors or descendants of the starting revision. --follow-first\n" +" only follows the first parent of merge revisions.\n" +"\n" +" If no revision range is specified, the default is tip:0 unless\n" +" --follow is set, in which case the working directory parent is\n" +" used as the starting revision.\n" +"\n" +" Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n" +"\n" +" By default this command outputs: changeset id and hash, tags,\n" +" non-trivial parents, user, date and time, and a summary for each\n" +" commit. When the -v/--verbose switch is used, the list of changed\n" +" files and full commit message is shown.\n" +"\n" +" NOTE: log -p may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only. Also, the files: list will only reflect files\n" +" that are different from BOTH parents.\n" +"\n" +" " + +msgid "" +"looks up all renames for a file (up to endrev) the first\n" +" time the file is given. It indexes on the changerev and only\n" +" parses the manifest if linkrev != changerev.\n" +" Returns rename info for fn at changerev rev." +msgstr "" + +msgid "" +"output the current or given revision of the project manifest\n" +"\n" +" Print a list of version controlled files for the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" The manifest is the list of files being version controlled. If no " +"revision\n" +" is given then the first parent of the working directory is used.\n" +"\n" +" With -v flag, print file permissions, symlink and executable bits. With\n" +" --debug flag, print file revision hashes.\n" +" " +msgstr "" + +msgid "" +"merge working directory with another revision\n" +"\n" +" Merge the contents of the current working directory and the\n" +" requested revision. Files that changed between either parent are\n" +" marked as changed for the next commit and a commit must be\n" +" performed before any further updates are allowed.\n" +"\n" +" If no revision is specified, the working directory's parent is a\n" +" head revision, and the current branch contains exactly one other head,\n" +" the other head is merged with by default. Otherwise, an explicit\n" +" revision to merge with must be provided.\n" +" " +msgstr "" + +msgid "branch '%s' has %d heads - please merge with an explicit rev" +msgstr "" + +msgid "branch '%s' has one head - please merge with an explicit rev" +msgstr "" + +msgid "there is nothing to merge" +msgstr "" + +msgid "%s - use \"hg update\" instead" +msgstr "" + +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" +msgstr "" + +msgid "" +"show changesets not found in destination\n" +"\n" +" Show changesets not found in the specified destination repository or\n" +" the default push location. These are the changesets that would be " +"pushed\n" +" if a push was requested.\n" +"\n" +" See pull for valid destination format details.\n" +" " +msgstr "" +"mostra changeset non trovati nella destinazione\n" +"\n" +" Mostra i changeset non trovati nel repository di destinazione\n" +" specificato o nella posizione di default di push. Questi sono i\n" +" changeset che di cui si effetterebbe il push se questo venisse\n" +" richiesto.\n" +"\n" +" Vedere pull per dettagli sui formati validi di destinazioni.\n" +" " + +#, fuzzy +msgid "" +"show the parents of the working dir or revision\n" +"\n" +" Print the working directory's parent revisions. If a\n" +" revision is given via --rev, the parent of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (before the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" +"mostra i genitori della directory di lavoro o di una revisione\n" +"\n" +" Stampa le revisioni genitori della directory di lavoro. Se una\n" +" revisione è data tramite --rev, the parent of that revision will\n" +" be printed. If a file argument is given, revision in which the\n" +" file was last changed (before the working directory revision or\n" +" the argument to --rev if given) is printed.\n" +" " + +msgid "can only specify an explicit file name" +msgstr "" + +msgid "'%s' not found in manifest!" +msgstr "'%s' non trovato nel manifesto!" + +msgid "" +"show definition of symbolic path names\n" +"\n" +" Show definition of symbolic path name NAME. If no name is given, show\n" +" definition of available names.\n" +"\n" +" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" +" " +msgstr "" + +msgid "not found!\n" +msgstr "non trovato!\n" + +msgid "not updating, since new heads added\n" +msgstr "" + +msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" +msgstr "" + +msgid "(run 'hg update' to get a working copy)\n" +msgstr "" + +msgid "" +"pull changes from the specified source\n" +"\n" +" Pull changes from a remote repository to a local one.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository. By default, this\n" +" does not update the copy of the project in the working directory.\n" +"\n" +" Valid URLs are of the form:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" Paths in the local filesystem can either point to Mercurial\n" +" repositories or to bundle files (as created by 'hg bundle' or\n" +" 'hg incoming --bundle').\n" +"\n" +" An optional identifier after # indicates a particular branch, tag,\n" +" or changeset to pull.\n" +"\n" +" Some notes about using SSH with Mercurial:\n" +" - SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +" - path is relative to the remote user's home directory by default.\n" +" Use an extra slash at the start of a path to specify an absolute " +"path:\n" +" ssh://example.com//tmp/repository\n" +" - Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +" " +msgstr "" +"effettua il pull delle modifiche dalla sorgente specificata\n" +"\n" +" Effettua il pull delle modifiche da un repository remoto ad uno locale.\n" +"\n" +" Questo trova tutte le modifiche dal repository al percorso o URL " +"specificato\n" +" e le aggiunge al repository locale. Di default, questo\n" +" non aggiorna la copia del progetto nella directory di lavoro.\n" +"\n" +" URL validi sono della forma:\n" +"\n" +" percorso/filesystem/locale (o file://percorso/filesystem/locale)\n" +" http://[utente[:password]@]host[:porta]/[percorso]\n" +" https://[utente[:password]@]host[:porta]/[percorso]\n" +" ssh://[utente[:password]@]host[:porta]/[percorso]\n" +"\n" +" I percorsi nel filesystem locale possono puntare a repository Mercurial\n" +" o a file bundle (come quelli creati da 'hg bundle' o\n" +" 'hg incoming --bundle').\n" +"\n" +" Un identificatore opzionale dopo # indica una branch particolare, tag,\n" +" o changeset di cui eseguire il pull.\n" +"\n" +" Alcune note riguardo all'uso di SSH con Mercurial:\n" +" - SSH richiede un account con accesso shell sulla macchina di\n" +" destinazione e una copia di hg nel percorso remoto o specificato da " +"remotecmd.\n" +" - il percorso di default è relativo alla home directory remota " +"dell'utente.\n" +" Usare un extra slash all'inizio del percorso per specificare un " +"percorso assoluto:\n" +" ssh://esempio.com//tmp/repository\n" +" - Mercurial non usa la propria compressione via SSH; la cosa giusta da " +"fare\n" +" è configurarla nel proprio ~/.ssh/config, es.:\n" +" Host *.miaretelocale.esempio.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" In alternativa specificare \"ssh -C\" come comando ssh nel proprio " +"hgrc\n" +" o con l'opzione --ssh nella riga di comando.\n" +" " + +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" +"L'altro repository non supporta la ricerca di revisioni, quindi una " +"revisione non può essere specificata." + +msgid "" +"push changes to the specified destination\n" +"\n" +" Push changes from the local repository to the given destination.\n" +"\n" +" This is the symmetrical operation for pull. It helps to move\n" +" changes from the current repository to a different one. If the\n" +" destination is local this is identical to a pull in that directory\n" +" from the current one.\n" +"\n" +" By default, push will refuse to run if it detects the result would\n" +" increase the number of remote heads. This generally indicates the\n" +" the client has forgotten to pull and merge before pushing.\n" +"\n" +" Valid URLs are of the form:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +"\n" +" An optional identifier after # indicates a particular branch, tag,\n" +" or changeset to push. If -r is used, the named changeset and all its\n" +" ancestors will be pushed to the remote repository.\n" +"\n" +" Look at the help text for the pull command for important details\n" +" about ssh:// URLs.\n" +"\n" +" Pushing to http:// and https:// URLs is only possible, if this\n" +" feature is explicitly enabled on the remote Mercurial server.\n" +" " +msgstr "" + +msgid "pushing to %s\n" +msgstr "sto effettuando il push verso %s\n" + +msgid "" +"raw commit interface (DEPRECATED)\n" +"\n" +" (DEPRECATED)\n" +" Lowlevel commit, for use in helper scripts.\n" +"\n" +" This command is not intended to be used by normal users, as it is\n" +" primarily useful for importing from other SCMs.\n" +"\n" +" This command is now deprecated and will be removed in a future\n" +" release, please use debugsetparents and commit instead.\n" +" " +msgstr "" + +msgid "(the rawcommit command is deprecated)\n" +msgstr "(il comando rawcommit è deprecato)\n" + +msgid "" +"roll back an interrupted transaction\n" +"\n" +" Recover from an interrupted commit or pull.\n" +"\n" +" This command tries to fix the repository status after an interrupted\n" +" operation. It should only be necessary when Mercurial suggests it.\n" +" " +msgstr "" +"effettua il rollback di una transazione interrotta\n" +"\n" +" Effettua il ripristino da un commit o pull interrotto.\n" +"\n" +" Questo comando prova a correggere lo stato del repository dopo\n" +" un'operazione interrotta. Dovrebbe essere necessario solamente\n" +" quando Mercurial lo suggerisce.\n" +" " + +msgid "" +"remove the specified files on the next commit\n" +"\n" +" Schedule the indicated files for removal from the repository.\n" +"\n" +" This only removes files from the current branch, not from the entire\n" +" project history. -A can be used to remove only files that have already\n" +" been deleted, -f can be used to force deletion, and -Af can be used\n" +" to remove files from the next revision without deleting them.\n" +"\n" +" The following table details the behavior of remove for different file\n" +" states (columns) and option combinations (rows). The file states are\n" +" Added, Clean, Modified and Missing (as reported by hg status). The\n" +" actions are Warn, Remove (from branch) and Delete (from disk).\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" +"\n" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "nessun file specificato" + +msgid "not removing %s: file %s (use -f to force removal)\n" +msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n" + +msgid "still exists" +msgstr "esiste ancora" + +msgid "is modified" +msgstr "è modificato" + +msgid "has been marked for add" +msgstr "è stato marcato per l'aggiunta" + +msgid "removing %s\n" +msgstr "sto rimuovendo %s\n" + +msgid "" +"rename files; equivalent of copy + remove\n" +"\n" +" Mark dest as copies of sources; mark sources for deletion. If\n" +" dest is a directory, copies are put in that directory. If dest is\n" +" a file, there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a rename\n" +" before that, see hg revert.\n" +" " +msgstr "" + +msgid "" +"retry file merges from a merge or update\n" +"\n" +" This command will cleanly retry unresolved file merges using file\n" +" revisions preserved from the last update or merge. To attempt to\n" +" resolve all unresolved files, use the -a switch.\n" +"\n" +" This command will also allow listing resolved files and manually\n" +" marking and unmarking files as resolved.\n" +"\n" +" The codes used to show the status of files are:\n" +" U = unresolved\n" +" R = resolved\n" +" " +msgstr "" + +msgid "too many options specified" +msgstr "troppe opzioni specificate" + +msgid "can't specify --all and patterns" +msgstr "non è possibile specificare pattern e --all" + +msgid "no files or directories specified; use --all to remerge all files" +msgstr "" +"nessun file o directory specificata; usare --all per rieffettuare il merge " +"di tutti i file" + +msgid "" +"restore individual files or dirs to an earlier state\n" +"\n" +" (use update -r to check out earlier revisions, revert does not\n" +" change the working dir parents)\n" +"\n" +" With no revision specified, revert the named files or directories\n" +" to the contents they had in the parent of the working directory.\n" +" This restores the contents of the affected files to an unmodified\n" +" state and unschedules adds, removes, copies, and renames. If the\n" +" working directory has two parents, you must explicitly specify the\n" +" revision to revert to.\n" +"\n" +" Using the -r option, revert the given files or directories to their\n" +" contents as of a specific revision. This can be helpful to \"roll\n" +" back\" some or all of an earlier change.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" Revert modifies the working directory. It does not commit any\n" +" changes, or change the parent of the working directory. If you\n" +" revert to a revision other than the parent of the working\n" +" directory, the reverted files will thus appear modified\n" +" afterwards.\n" +"\n" +" If a file has been deleted, it is restored. If the executable\n" +" mode of a file was changed, it is reset.\n" +"\n" +" If names are given, all files matching the names are reverted.\n" +" If no arguments are given, no files are reverted.\n" +"\n" +" Modified files are saved with a .orig suffix before reverting.\n" +" To disable these backups, use --no-backup.\n" +" " +msgstr "" +"ripristina file singoli o directory ad uno stato precedente\n" +"\n" +" (usare update -r per effettuare il checkout di revisioni\n" +" precedenti, revert non cambia i genitori della directory di\n" +" lavoro)\n" +"\n" +" Se nessuna revisione viene specificata, i file o directory\n" +" specificati vengono riportati al contenuto che avevano nel\n" +" genitore della directory di lavoro. Questo ripristina il contenuto\n" +" dei file interessati ad uno stato non modificato e annulla\n" +" aggiunte, rimozioni, copie e rinomine. Se la directory di lavoro\n" +" ha due genitori, è necessario specificare esplicitamente la\n" +" revisione a cui tornare.\n" +"\n" +" Usando l'opzione -r, riporta i dati file o directory al loro\n" +" contenuto ad una specifica revisione. Questo può essere utile per\n" +" effettuare il \"roll back\" di alcune o tutte le modifiche\n" +" precedenti. Vedere 'hg help dates' per un elenco dei formati\n" +" validi per -d/--date.\n" +"\n" +" Revert modifica la directory di lavoro. Non effettua il commit di\n" +" alcuna modifica, nè cambia i genitori della directory di lavoro Se\n" +" si effettua il revert ad una revisione differente di quella del\n" +" genitore della directory di lavoro, i file interessati in seguito\n" +" appariranno quindi modificati.\n" +"\n" +" Se un file è stato cancellato viene ripristinato. Se è stato\n" +" modificato il flag di esecuzione di file, questo viene resettato.\n" +"\n" +" Se vengono forniti nomi, tutti i file corrispondenti ai nomi\n" +" vengono ripristinati. Se non vengono forniti argomenti nessun file\n" +" viene ripristinato.\n" +"\n" +" I file modificati vengono salvati con un suffisso .orig prima di\n" +" essere ripristinati. Per disabilitare questi backup, usare\n" +" --no-backup.\n" +" " + +msgid "you can't specify a revision and a date" +msgstr "non è possibile specificare sia una revisione sia una data" + +msgid "no files or directories specified; use --all to revert the whole repo" +msgstr "" +"nessun file o directory specificati; usare --all per ripristinare l'intero " +"repository" + +msgid "forgetting %s\n" +msgstr "sto dimenticandomi di %s\n" + +msgid "reverting %s\n" +msgstr "sto ripristinando %s\n" + +msgid "undeleting %s\n" +msgstr "sto annullando la rimozione di %s\n" + +msgid "saving current version of %s as %s\n" +msgstr "sto salvando la versione corrente di %s come %s\n" + +msgid "file not managed: %s\n" +msgstr "file non gestito: %s\n" + +msgid "no changes needed to %s\n" +msgstr "nessuna modifica richiesta per %s\n" + +msgid "" +"roll back the last transaction\n" +"\n" +" This command should be used with care. There is only one level of\n" +" rollback, and there is no way to undo a rollback. It will also\n" +" restore the dirstate at the time of the last transaction, losing\n" +" any dirstate changes since that time.\n" +"\n" +" Transactions are used to encapsulate the effects of all commands\n" +" that create new changesets or propagate existing changesets into a\n" +" repository. For example, the following commands are transactional,\n" +" and their effects can be rolled back:\n" +"\n" +" commit\n" +" import\n" +" pull\n" +" push (with this repository as destination)\n" +" unbundle\n" +"\n" +" This command is not intended for use on public repositories. Once\n" +" changes are visible for pull by other users, rolling a transaction\n" +" back locally is ineffective (someone else may already have pulled\n" +" the changes). Furthermore, a race is possible with readers of the\n" +" repository; for example an in-progress pull from the repository\n" +" may fail if a rollback is performed.\n" +" " +msgstr "" +"effettua il rollback dell'ultima transazione\n" +"\n" +" Questo comando dovrebbe essere usato con cautela. Esiste un solo\n" +" livello di rollback e non c'è modo di annullare un rollback.\n" +" Ripristinerà anche il dirstate al tempo dell'ultima transazione,\n" +" perdendo qualunque modifica ad esso da quel momento in poi.\n" +"\n" +" Le transazioni sono usate per incapsulare gli effetti di tutti i\n" +" comandi che creano nuovi changeset o propagano changeset esistenti\n" +" in un altro repository. Ad esempio, i seguenti comandi sono\n" +" transazionali ed è possibile effettuare il rollback dei loro\n" +" effetti:\n" +"\n" +" commit\n" +" import\n" +" pull\n" +" push (con questo repository come destinazione)\n" +" unbundle\n" +"\n" +" L'uso di questo comando non è inteso per repository pubblici. Una\n" +" volta che le modifiche sono visibili per il pull da parte di altri\n" +" utenti, effettuare il rollback locale di una transazione non ha\n" +" effetti (qualcun'altro potrebbe aver già effettuato il pull delle\n" +" modifiche). Inoltre, è possibile che si verifichi un race con i\n" +" lettori del repository; ad esempio un pull in progresso dal\n" +" repository potrebbe fallire se viene effettuato un rollback.\n" +" " + +msgid "" +"print the root (top) of the current working dir\n" +"\n" +" Print the root directory of the current repository.\n" +" " +msgstr "" +"stampa la radice (top) della directory di lavoro corrente\n" +"\n" +" Stampa la directory radice del repository corrente.\n" +" " + +msgid "" +"export the repository via HTTP\n" +"\n" +" Start a local HTTP repository browser and pull server.\n" +"\n" +" By default, the server logs accesses to stdout and errors to\n" +" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" " +msgstr "" +"esporta il repository via HTTP\n" +"\n" +" Avvia un server HTTP locale per il pull e la navigazione.\n" +"\n" +" Di default i log del server vengono inviati allo stdout e gli\n" +" errori allo stderr. Usare le opzioni \"-A\" e \"-E\" per effettuare il\n" +" log su file.\n" +" " + +msgid "listening at http://%s%s/%s (bound to %s:%d)\n" +msgstr "in ascolto su http://%s%s/%s (limitato a %s:%d)\n" + +msgid "" +"show changed files in the working directory\n" +"\n" +" Show status of files in the repository. If names are given, only\n" +" files that match are shown. Files that are clean or ignored or\n" +" source of a copy/move operation, are not listed unless -c (clean),\n" +" -i (ignored), -C (copies) or -A is given. Unless options described\n" +" with \"show only ...\" are given, the options -mardu are used.\n" +"\n" +" Option -q/--quiet hides untracked (unknown and ignored) files\n" +" unless explicitly requested with -u/--unknown or -i/-ignored.\n" +"\n" +" NOTE: status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does not\n" +" report permission changes and diff only reports changes relative\n" +" to one merge parent.\n" +"\n" +" If one revision is given, it is used as the base revision.\n" +" If two revisions are given, the difference between them is shown.\n" +"\n" +" The codes used to show the status of files are:\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = deleted, but still tracked\n" +" ? = not tracked\n" +" I = ignored\n" +" = the previous added file was copied from here\n" +" " +msgstr "" + +msgid "" +"add one or more tags for the current or given revision\n" +"\n" +" Name a particular revision using <name>.\n" +"\n" +" Tags are used to name particular revisions of the repository and are\n" +" very useful to compare different revisions, to go back to significant\n" +" earlier versions or to mark branch points as releases, etc.\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" To facilitate version control, distribution, and merging of tags,\n" +" they are stored as a file named \".hgtags\" which is managed\n" +" similarly to other project files and can be hand-edited if\n" +" necessary. The file '.hg/localtags' is used for local tags (not\n" +" shared among repositories).\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"aggiunge una o più tag per la revisione corrente o data\n" +"\n" +" Nomina una revisione particolare usando <nome>.\n" +"\n" +" Le tag sono usate per dare un nome a revisioni particolari del\n" +" repository e sono molto utili per confrontare revisioni\n" +" differenti, per tornare indietro a versioni precedenti\n" +" significative o per marcare punti di branch come release, ecc.\n" +"\n" +" Se nessuna revisione viene fornita, viene usato il genitore della\n" +" directory di lavoro, o tip se non si è effettuato il check out di\n" +" nessuna revisione.\n" +"\n" +" Per facilitare il controllo di versione, la distribuzione e il\n" +" merge di tag, sono memorizzate come file chiamato \".hgtags\" che è\n" +" gestito analogamente ad altri file del progetto e può essere\n" +" modificato manualmente se necessario. Il file '.hg/localtags' è\n" +" usato per le tag locali (non condivise tra repository).\n" +"\n" +" Vedere 'hg help dates' per un elenco di formati validi per\n" +" -d/--date.\n" +" " + +msgid "tag names must be unique" +msgstr "i nomi delle tag devono essere univoci" + +msgid "the name '%s' is reserved" +msgstr "il nome '%s' è riservato" + +msgid "--rev and --remove are incompatible" +msgstr "--rev e --remove sono incompatibili" + +msgid "tag '%s' does not exist" +msgstr "la tag '%s' non esiste" + +msgid "tag '%s' is not a %s tag" +msgstr "la tag '%s' non è una tag %s" + +msgid "Removed tag %s" +msgstr "Rimossa tag %s" + +msgid "tag '%s' already exists (use -f to force)" +msgstr "la tag '%s' esiste già (usare -f per forzare)" + +msgid "Added tag %s for changeset %s" +msgstr "Aggiunta tag %s per il changeset %s" + +msgid "" +"list repository tags\n" +"\n" +" This lists both regular and local tags. When the -v/--verbose switch\n" +" is used, a third column \"local\" is printed for local tags.\n" +" " +msgstr "" +"elenca le tag del repository\n" +"\n" +" Questo elenca sia le tag regolari sia le tag locali. Quando viene usata " +"l'opzione -v/--verbose\n" +" una terza colonna \"local\" viene stampata per le tag locali.\n" +" " + +msgid "" +"show the tip revision\n" +"\n" +" The tip revision (usually just called the tip) is the most\n" +" recently added changeset in the repository, the most recently\n" +" changed head.\n" +"\n" +" If you have just made a commit, that commit will be the tip. If\n" +" you have just pulled changes from another repository, the tip of\n" +" that repository becomes the current tip. The \"tip\" tag is special\n" +" and cannot be renamed or assigned to a different changeset.\n" +" " +msgstr "" +"mostra la revisione tip\n" +"\n" +" La revisione tip (di solito chiamata solo tip) è il più recente\n" +" changeset aggiunto al repository, l'head modificata più\n" +" recentemente.\n" +"\n" +" Se si ha fatto solo un commit, quel commit sarà il tip. Se si ha\n" +" appena fatto il pull di modifiche da un altro repository, il tip\n" +" di quel repository diventa il tip corrente. La tag \"tip\" tag è\n" +" speciale e non può essere rinominata o assegnata ad un changeset\n" +" differente.\n" +" " + +msgid "" +"apply one or more changegroup files\n" +"\n" +" Apply one or more compressed changegroup files generated by the\n" +" bundle command.\n" +" " +msgstr "" +"applica uno o più file changegroup\n" +"\n" +" Applica uno o più file changegroup compressi generati dal\n" +" comando bundle.\n" +" " + +msgid "" +"update working directory\n" +"\n" +" Update the repository's working directory to the specified revision,\n" +" or the tip of the current branch if none is specified. Use null as\n" +" the revision to remove the working copy (like 'hg clone -U').\n" +"\n" +" When the working dir contains no uncommitted changes, it will be\n" +" replaced by the state of the requested revision from the repo. When\n" +" the requested revision is on a different branch, the working dir\n" +" will additionally be switched to that branch.\n" +"\n" +" When there are uncommitted changes, use option -C to discard them,\n" +" forcibly replacing the state of the working dir with the requested\n" +" revision.\n" +"\n" +" When there are uncommitted changes and option -C is not used, and\n" +" the parent revision and requested revision are on the same branch,\n" +" and one of them is an ancestor of the other, then the new working\n" +" directory will contain the requested revision merged with the\n" +" uncommitted changes. Otherwise, the update will fail with a\n" +" suggestion to use 'merge' or 'update -C' instead.\n" +"\n" +" If you want to update just one file to an older revision, use revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for --date.\n" +" " +msgstr "" +"aggiorna la directory di lavoro\n" +"\n" +" Aggiorna la directory di lavoro del repository ad una revisione\n" +" specifica, o al tip della branch corrente se nessuna è stata\n" +" specificata. Usare null come revisione per rimuovere la copia di\n" +" lavoro (come 'hg clone -U').\n" +"\n" +" Quando la directory di lavoro non contiene modifiche di cui non si\n" +" è eseguito il commit, sarà rimpiazzata dallo stato della revisione\n" +" richiesta dal repository. Quando la revisione richiesta è su una\n" +" branch differente, la directory di lavoro verrà inoltre spostata\n" +" su quella branch.\n" +"\n" +" Quandi ci sono modifiche di cui non si è eseguito il commit, usare\n" +" l'opzione -C per scartarle, forzando la sostituzione dello stato\n" +" della directory di lavoro con la revisione richiesta.\n" +"\n" +" Quando ci sono modifiche di cui non si è eseguito il commit,\n" +" l'opzione -C non è usata, la revisione del genitore e di quella\n" +" richiesta sono sulla stessa branch e una di queste è un antenato\n" +" dell'altro, allora la nuova directory di lavoro conterrà la\n" +" revisione richiesta unita con le modifiche non salvate. Altrimenti\n" +" l'aggiornamento fallirà con un suggerimento di usare invece\n" +" 'merge' o 'update -C'.\n" +"\n" +" Se si desidera aggiornare solo un file ad una revisione più\n" +" vecchia, usare revert.\n" +"\n" +" Vedere 'hg help dates' per un elenco di formati validi per --date.\n" +" " + +msgid "" +"verify the integrity of the repository\n" +"\n" +" Verify the integrity of the current repository.\n" +"\n" +" This will perform an extensive check of the repository's\n" +" integrity, validating the hashes and checksums of each entry in\n" +" the changelog, manifest, and tracked files, as well as the\n" +" integrity of their crosslinks and indices.\n" +" " +msgstr "" +"verifica l'integrità del repository\n" +"\n" +" Verifica l'integrità del repository corrente.\n" +"\n" +" Questo comando eseguirà un controllo estensivo dell'integrità del\n" +" repository validando gli hash e i checksum di ogni voce nel\n" +" changelog, manifesto, e file tracciati, così come l'integrità dei\n" +" loro link incrociati e indici.\n" +" " + +msgid "output version and copyright information" +msgstr "stampa la versione e le informazioni di copyright" + +msgid "Mercurial Distributed SCM (version %s)\n" +msgstr "Mercurial SCM Distribuito (versione %s)\n" + +msgid "" +"\n" +"Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" +"\n" +"Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> e altri\n" +"Questo è software libero; vedere i sorgenti per le condizioni di copia. Non " +"c'è alcuna garanzia;\n" +"neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO SCOPO PARTICOLARE.\n" + +msgid "repository root directory or symbolic path name" +msgstr "directory radice del repository o nome del percorso simbolico" + +msgid "change working directory" +msgstr "cambia la directory di lavoro" + +msgid "do not prompt, assume 'yes' for any required answers" +msgstr "non chiedere conferma, assume 'yes' per ogni risposta richiesta" + +msgid "suppress output" +msgstr "sopprime l'output" + +msgid "enable additional output" +msgstr "abilita output aggiuntivo" + +msgid "set/override config option" +msgstr "imposta/sovrascrive l'opzione di configurazione" + +msgid "enable debugging output" +msgstr "abilita output di debug" + +msgid "start debugger" +msgstr "avvia il debugger" + +msgid "set the charset encoding" +msgstr "imposta la codifica dei caratteri" + +msgid "set the charset encoding mode" +msgstr "imposta la modalità di codifica dei caratteri" + +msgid "print improved command execution profile" +msgstr "stampa il profilo di esecuzione dei comandi migliorato" + +msgid "print traceback on exception" +msgstr "stampa un traceback in seguito ad eccezioni" + +msgid "time how long the command takes" +msgstr "misura quanto tempo impiega il comando" + +msgid "print command execution profile" +msgstr "stampa il profilo di esecuzione dei comandi" + +msgid "output version information and exit" +msgstr "stampa informazioni sulla versione ed esce" + +msgid "display help and exit" +msgstr "mostra l'aiuto ed esce" + +msgid "do not perform actions, just print output" +msgstr "non esegue azioni, stampa solamente l'output" + +msgid "specify ssh command to use" +msgstr "specifica il comando ssh da usare" + +msgid "specify hg command to run on the remote side" +msgstr "specifica il comando hg da eseguire in remoto" + +msgid "include names matching the given patterns" +msgstr "include nomi che corrispondono ai pattern dati" + +msgid "exclude names matching the given patterns" +msgstr "esclude nomi che corrispondono ai pattern dati" + +msgid "use <text> as commit message" +msgstr "usa <text> come messaggio di commit" + +msgid "read commit message from <file>" +msgstr "legge il messaggio di commit da <file>" + +msgid "record datecode as commit date" +msgstr "registra il datecode come data del commit" + +msgid "record user as committer" +msgstr "registra l'utente come committente" + +#, fuzzy +msgid "display using template map file" +msgstr "mostra usando un file mappa template" + +msgid "display with template" +msgstr "mostra con un template" + +msgid "do not show merges" +msgstr "non mostrare i merge" + +msgid "treat all files as text" +msgstr "tratta tutti i file come testo" + +msgid "don't include dates in diff headers" +msgstr "non includere le date nelle intestazioni dei diff" + +msgid "show which function each change is in" +msgstr "mostra in quale funzione si trova ogni modifica" + +msgid "ignore white space when comparing lines" +msgstr "ignora spazi bianchi quando si confrontano righe" + +msgid "ignore changes in the amount of white space" +msgstr "ignora le modifiche nel conteggio degli spazi bianchi" + +msgid "ignore changes whose lines are all blank" +msgstr "ignora le modifiche le cui righe sono tutte vuote" + +msgid "number of lines of context to show" +msgstr "numero di righe di contesto da mostrare" + +msgid "guess renamed files by similarity (0<=s<=100)" +msgstr "stima i file rinominati per similarità (0<=s<=100)" + +msgid "[OPTION]... [FILE]..." +msgstr "[OPZIONI]... [FILE]..." + +msgid "annotate the specified revision" +msgstr "annota la revisione specificata" + +msgid "follow file copies and renames" +msgstr "segue le copie e le rinomine dei file" + +msgid "list the author (long with -v)" +msgstr "elenca l'autore (verboso con -v)" + +msgid "list the date (short with -q)" +msgstr "elenca la data (breve con -q)" + +msgid "list the revision number (default)" +msgstr "elenca il numero di revisione (default)" + +msgid "list the changeset" +msgstr "elenca il changeset" + +msgid "show line number at the first appearance" +msgstr "mostra il numero di riga alla prima apparizione" + +msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." +msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." + +msgid "do not pass files through decoders" +msgstr "non passare file attraverso decodificatori" + +msgid "directory prefix for files in archive" +msgstr "prefisso di directory per i file nell'archivio" + +msgid "revision to distribute" +msgstr "revisione da distribuire" + +msgid "type of distribution to create" +msgstr "tipo di distribuzione da creare" + +msgid "[OPTION]... DEST" +msgstr "[OPZIONI]... DEST" + +msgid "merge with old dirstate parent after backout" +msgstr "effettua il merge con il vecchio dirstate del genitore dopo il backout" + +msgid "parent to choose when backing out merge" +msgstr "il genitore da scegliere quando effettuare il backout del merge" + +msgid "revision to backout" +msgstr "revisione di cui effettuare il backout" + +msgid "[OPTION]... [-r] REV" +msgstr "[OPZIONI]... [-r] REV" + +msgid "reset bisect state" +msgstr "resetta lo stato di bisect" + +msgid "mark changeset good" +msgstr "marca il changeset come buono" + +msgid "mark changeset bad" +msgstr "marca il changeset come cattivo" + +msgid "skip testing changeset" +msgstr "salta il changeset di test" + +msgid "use command to check changeset state" +msgstr "usa il comando per controllare lo stato del changeset" + +msgid "do not update to target" +msgstr "non aggiornare a target" + +msgid "[-gbsr] [-c CMD] [REV]" +msgstr "[-gbsr] [-c CMD] [REV]" + +msgid "set branch name even if it shadows an existing branch" +msgstr "imposta il nome della branch anche se nasconde una branch esistente" + +msgid "reset branch name to parent branch name" +msgstr "resetta il nome della branch al nome della branch genitore" + +msgid "[-fC] [NAME]" +msgstr "[-fC] [NOME]" + +msgid "show only branches that have unmerged heads" +msgstr "" +"mostra solo le branch che hanno head di cui non si è effettuato il merge" + +msgid "[-a]" +msgstr "[-a]" + +msgid "run even when remote repository is unrelated" +msgstr "esegui anche quando il repository remoto non è collegato" + +msgid "a changeset up to which you would like to bundle" +msgstr "un changeset fino al quale si desidera effettuare il bundle" + +msgid "a base changeset to specify instead of a destination" +msgstr "un changeset base da specificare invece di una destinazione" + +msgid "bundle all changesets in the repository" +msgstr "effettua il bundle di tutti i changeset nel repository" + +msgid "bundle compression type to use" +msgstr "tipo di compressione da usare per il bundle" + +msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" + +msgid "print output to file with formatted name" +msgstr "stampa l'output su file con un nome formattato" + +msgid "print the given revision" +msgstr "stampa la data revisione" + +msgid "apply any matching decode filter" +msgstr "applica qualunque filtro di decodifica corrispondente" + +msgid "[OPTION]... FILE..." +msgstr "[OPZIONI]... FILE..." + +msgid "the clone will only contain a repository (no working copy)" +msgstr "il clone conterrà solo un repository (nessuna copia di lavoro)" + +msgid "a changeset you would like to have after cloning" +msgstr "un changeset che si desidera avere dopo il clone" + +msgid "[OPTION]... SOURCE [DEST]" +msgstr "[OPZIONI]... SORGENTE [DEST]" + +msgid "mark new/missing files as added/removed before committing" +msgstr "" +"marca file nuovi/mancanti come aggiunti/rimossi prima di effettuare il commit" + +msgid "mark a branch as closed, hiding it from the branch list" +msgstr "marca una branch come chiusa, nascondendola dall'elenco delle branch" + +msgid "record a copy that has already occurred" +msgstr "registra una copia che si è già verificata" + +msgid "forcibly copy over an existing managed file" +msgstr "forza una copia su un file gestito esistente" + +msgid "[OPTION]... [SOURCE]... DEST" +msgstr "[OPZIONI]... [SORGENTE]... DEST" + +msgid "[INDEX] REV1 REV2" +msgstr "[INDICE] REV1 REV2" + +msgid "show the command options" +msgstr "mostra le opzioni dei comandi" + +msgid "[-o] CMD" +msgstr "[-o] CMD" + +msgid "try extended date formats" +msgstr "prova formati di date estesi" + +msgid "[-e] DATE [RANGE]" +msgstr "[-e] DATA [RANGE]" + +msgid "FILE REV" +msgstr "FILE REV" + +msgid "[PATH]" +msgstr "[PERCORSO]" + +msgid "FILE" +msgstr "FILE" + +msgid "parent" +msgstr "genitore" + +msgid "file list" +msgstr "elenco dei file" + +msgid "revision to rebuild to" +msgstr "revisione alla quale ricostruire" + +msgid "[-r REV] [REV]" +msgstr "[-r REV] [REV]" + +msgid "revision to debug" +msgstr "revisione di cui fare il debug" + +msgid "[-r REV] FILE" +msgstr "[-r REV] FILE" + +msgid "REV1 [REV2]" +msgstr "REV1 [REV2]" + +msgid "do not display the saved mtime" +msgstr "non mostrare l'mtime salvato" + +msgid "[OPTION]..." +msgstr "[OPZIONI]..." + +msgid "change made by revision" +msgstr "modifica effettuata dalla revisione" + +msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." +msgstr "[OPZIONI]... [-r REV1 [-r REV2]] [FILE]..." + +msgid "diff against the second parent" +msgstr "effettua il diff con il secondo genitore" + +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "[OPZIONI]... [-o OUTFILESPEC] REV..." + +msgid "end fields with NUL" +msgstr "termina i campi con NUL" + +msgid "print all revisions that match" +msgstr "stampa tutte le revisioni che corrispondono" + +msgid "follow changeset history, or file history across copies and renames" +msgstr "" +"segue la storia del changeset, o la storia del file attraverso copie e " +"rinomine" + +msgid "ignore case when matching" +msgstr "ignora il case quando si cercano corrispondenze" + +msgid "print only filenames and revs that match" +msgstr "stampa solo i nomi dei file e le revisioni che corrispondono" + +msgid "print matching line numbers" +msgstr "stampa i numeri di riga corrispondenti" + +msgid "search in given revision range" +msgstr "cerca nell'intervallo di revisioni fornito" + +msgid "[OPTION]... PATTERN [FILE]..." +msgstr "[OPZIONI]... PATTERN [FILE]..." + +msgid "show only heads which are descendants of rev" +msgstr "mostra solo le head che sono discendenti della revisione" + +msgid "show only the active heads from open branches" +msgstr "mostra solo le head attive dalle branch aperte" + +msgid "[-r REV] [REV]..." +msgstr "[-r REV] [REV]..." + +msgid "[TOPIC]" +msgstr "[ARGOMENTO]" + +msgid "identify the specified rev" +msgstr "identifica la revisione specificata" + +msgid "show local revision number" +msgstr "mostra il numero locale della revisione" + +msgid "show global revision id" +msgstr "mostra id globale della revisione" + +msgid "show branch" +msgstr "mostra le branch" + +msgid "show tags" +msgstr "mostra le tag" + +msgid "[-nibt] [-r REV] [SOURCE]" +msgstr "[-nibt] [-r REV] [SORGENTE]" + +msgid "" +"directory strip option for patch. This has the same\n" +"meaning as the corresponding patch option" +msgstr "" +"opzione di rimozione della directory per patch. Questa ha lo stesso\n" +"significato dell'opzione corrispondente di patch" + +msgid "base path" +msgstr "percorso base" + +msgid "skip check for outstanding uncommitted changes" +msgstr "" +"salta il controllo di modifiche pendenti di cui non si è effettuato il commit" + +msgid "don't commit, just update the working directory" +msgstr "non effettuare il commit, aggiorna solo la directory di lavoro" + +msgid "apply patch to the nodes from which it was generated" +msgstr "applica la patch al nodo da cui è stata generata" + +msgid "Use any branch information in patch (implied by --exact)" +msgstr "" +"Usa qualunque informazione sulla branch nella patch (implicato da --exact)" + +msgid "[OPTION]... PATCH..." +msgstr "[OPZIONI]... PATCH..." + +msgid "show newest record first" +msgstr "mostra prima il record più nuovo" + +msgid "file to store the bundles into" +msgstr "file in cui salvare i bundle" + +msgid "a specific revision up to which you would like to pull" +msgstr "una specifica revisione fino alla quale si desidera fare il pull" + +msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" +msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle NOME_FILE] [SORGENTE]" + +msgid "[-e CMD] [--remotecmd CMD] [DEST]" +msgstr "[-e CMD] [--remotecmd CMD] [DEST]" + +msgid "search the repository as it stood at rev" +msgstr "cerca nel repository per come era alla revisione rev" + +msgid "end filenames with NUL, for use with xargs" +msgstr "termina il nome dei file con NUL, da usare con xargs" + +msgid "print complete paths from the filesystem root" +msgstr "stampa i percorsi completi dalla radice del filesystem" + +msgid "[OPTION]... [PATTERN]..." +msgstr "[OPZIONI]... [PATTERN]..." + +msgid "only follow the first parent of merge changesets" +msgstr "segui solo il primo genitore di un changeset di merge" + +msgid "show revs matching date spec" +msgstr "mostra le revisioni che corrispondono ad una data fornita" + +msgid "show copied files" +msgstr "mostra i file copiati" + +msgid "do case-insensitive search for a keyword" +msgstr "effettua una ricerca case-insensitive di una parola chiave" + +msgid "include revs where files were removed" +msgstr "include le revisioni in cui sono stati rimossi dei file" + +msgid "show only merges" +msgstr "mostra solo i merge" + +msgid "revs committed by user" +msgstr "commit delle revisioni effettuato dall'utente" + +msgid "show only changesets within the given named branch" +msgstr "mostra solo i changeset all'interno della data named branch" + +msgid "do not display revision or any of its ancestors" +msgstr "non mostrare la revisione o qualche suo antenato" + +msgid "[OPTION]... [FILE]" +msgstr "[OPZIONI]... [FILE]" + +msgid "revision to display" +msgstr "revisione da mostrare" + +msgid "[-r REV]" +msgstr "[-r REV]" + +msgid "force a merge with outstanding changes" +msgstr "forza un merge con modifiche pendenti" + +msgid "revision to merge" +msgstr "revisione di cui fare il merge" + +msgid "[-f] [[-r] REV]" +msgstr "[-f] [[-r] REV]" + +msgid "a specific revision up to which you would like to push" +msgstr "una specifica revisione fino alla quale si desidera effettuare il push" + +msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" +msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" + +msgid "show parents from the specified rev" +msgstr "mostra i genitori della revisione specificata" + +msgid "hg parents [-r REV] [FILE]" +msgstr "hg parents [-r REV] [FILE]" + +msgid "[NAME]" +msgstr "[NOME]" + +msgid "update to new tip if changesets were pulled" +msgstr "aggiorna alla nuova tip se si è effettuato il pull di changeset" + +msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SORGENTE]" + +msgid "force push" +msgstr "forza il push" + +msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" +msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" + +msgid "record delete for missing files" +msgstr "registra cancellazione per i file mancanti" + +msgid "remove (and delete) file even if added or modified" +msgstr "rimuove (e cancella) i file anche se sono stati aggiunti o modificati" + +msgid "record a rename that has already occurred" +msgstr "registra una rinomina che si è già verificata" + +msgid "[OPTION]... SOURCE... DEST" +msgstr "[OPZIONI]... SORGENTE... DEST" + +msgid "remerge all unresolved files" +msgstr "rieffettua il merge di tutti i file non risolti" + +msgid "list state of files needing merge" +msgstr "elenca lo stato dei file che necessitano merge" + +msgid "mark files as resolved" +msgstr "marca i file come risolti" + +msgid "unmark files as resolved" +msgstr "smarca i file come risolti" + +msgid "revert all changes when no arguments given" +msgstr "annulla tutte le modifiche quando nessun argomento è stato fornito" + +msgid "tipmost revision matching date" +msgstr "la revisione più vicina a tip corrispondente alla data" + +msgid "revision to revert to" +msgstr "revisione a cui annullare" + +msgid "do not save backup copies of files" +msgstr "non salva copie di backup dei file" + +msgid "[OPTION]... [-r REV] [NAME]..." +msgstr "[OPZIONI]... [-r REV] [NOME]..." + +msgid "name of access log file to write to" +msgstr "nome del file di log degli accessi su cui scrivere" + +msgid "name of error log file to write to" +msgstr "nome del file di log degli errori su cui scrivere" + +msgid "port to listen on (default: 8000)" +msgstr "porta su cui stare in ascolto (default: 8000)" + +msgid "address to listen on (default: all interfaces)" +msgstr "indirizzo su cui stare in ascolto (default: tutte le interfacce)" + +msgid "prefix path to serve from (default: server root)" +msgstr "prefisso del percorso da cui servire (default: radice del server)" + +msgid "name to show in web pages (default: working dir)" +msgstr "nome da mostrare nelle pagine web (default: la directory di lavoro)" + +msgid "name of the webdir config file (serve more than one repo)" +msgstr "nome del file di configurazione webdir (serve più di un repository)" + +msgid "for remote clients" +msgstr "per i client remoti" + +msgid "web templates to use" +msgstr "template web da usare" + +msgid "template style to use" +msgstr "stile dei template da usare" + +msgid "use IPv6 in addition to IPv4" +msgstr "usa IPv6 in aggiunta ad IPv4" + +msgid "SSL certificate file" +msgstr "file del certificato SSL" + +msgid "show untrusted configuration options" +msgstr "mostra le opzioni di configurazioni non affidabili" + +msgid "[-u] [NAME]..." +msgstr "[-u] [NOME]..." + +msgid "show status of all files" +msgstr "mostra lo stato di tutti i file" + +msgid "show only modified files" +msgstr "mostra solo i file modificati" + +msgid "show only added files" +msgstr "mostra solo i file aggiunti" + +msgid "show only removed files" +msgstr "mostra solo i file rimossi" + +msgid "show only deleted (but tracked) files" +msgstr "mostra solo i file rimossi (ma tracciati)" + +msgid "show only files without changes" +msgstr "mostra solo i file senza modifiche" + +msgid "show only unknown (not tracked) files" +msgstr "mostra solo i file sconosciuti (non tracciati)" + +msgid "show only ignored files" +msgstr "mostra solo i file ignorati" + +msgid "hide status prefix" +msgstr "nascondi lo stato del prefisso" + +msgid "show source of copied files" +msgstr "mostra la sorgente dei file copiati" + +msgid "show difference from revision" +msgstr "mostra le differenze dalla revisione" + +msgid "replace existing tag" +msgstr "rimpiazza tag esistente" + +msgid "make the tag local" +msgstr "rendi la tag locale" + +msgid "revision to tag" +msgstr "revisione da taggare" + +msgid "remove a tag" +msgstr "rimuove una tag" + +msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "[-l] [-m TESTO] [-d DATA] [-u UTENTE] [-r REV] NOME..." + +msgid "[-p]" +msgstr "[-p]" + +msgid "update to new tip if changesets were unbundled" +msgstr "aggiorna alla nuova tip se changeset sono stati estratti da un bundle" + +msgid "[-u] FILE..." +msgstr "[-u] FILE..." + +msgid "overwrite locally modified files (no backup)" +msgstr "sovrascrivi file modificati localmente (nessun backup)" + +msgid "[-C] [-d DATE] [[-r] REV]" +msgstr "[-C] [-d DATA] [[-r] REV]" + +msgid "OPTIONS" +msgstr "OPZIONI" + +msgid "COMMANDS" +msgstr "COMANDI" + +msgid " options:\n" +msgstr " opzioni:\n" + +msgid "" +" aliases: %s\n" +"\n" +msgstr "" +" alias: %s\n" +"\n" + +msgid "%s is not a valid revision in current branch" +msgstr "%s non è una revisione valida nella branch corrente" + +msgid "%s is not available in %s anymore" +msgstr "%s non è più disponibile in %s" + +msgid "cannot find required \"%s\" tool" +msgstr "impossibile trovare il tool \"%s\"" + +msgid "running: %s\n" +msgstr "sto eseguendo: %s\n" + +msgid "%s error:\n" +msgstr "%s errore:\n" + +msgid "%s %s" +msgstr "%s %s" + +msgid "could not open map file %r: %s" +msgstr "impossibile aprire il file di associazione %r: %s" + +msgid "%s: missing or unsupported repository" +msgstr "%s: repository mancante o non supportato" + +msgid "convert: %s\n" +msgstr "convert: %s\n" + +msgid "%s: unknown repository type" +msgstr "%s: tipo di repository sconosciuto" + +msgid "cycle detected between %s and %s" +msgstr "ciclo rilevato tra %s e %s" + +msgid "not all revisions were sorted" +msgstr "non tutte le revisioni erano ordinate" + +msgid "Writing author map file %s\n" +msgstr "Scrivo il file di associazione degli autori %s\n" + +msgid "Overriding mapping for author %s, was %s, will be %s\n" +msgstr "Rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n" + +msgid "mapping author %s to %s\n" +msgstr "sto associando l'autore %s a %s\n" + +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "Ignoro riga non valida nel file di associazione degli autori %s: %s\n" + +msgid "spliced in %s as parents of %s\n" +msgstr "" + +msgid "scanning source...\n" +msgstr "sto effettuando la scansione della sorgente...\n" + +msgid "sorting...\n" +msgstr "sto ordinando...\n" + +msgid "converting...\n" +msgstr "sto effettuando la conversione...\n" + +msgid "source: %s\n" +msgstr "sorgente: %s\n" + +msgid "assuming destination %s\n" +msgstr "assumo destinazione %s\n" + +#, fuzzy +msgid "revision %s is not a patchset number or date" +msgstr "la revisione %s non è un numero di patchset o una data" + +msgid "using builtin cvsps\n" +msgstr "sto usando cvsps integrato\n" + +msgid "connecting to %s\n" +msgstr "sto connettendomi a %s\n" + +msgid "CVS pserver authentication failed" +msgstr "autenticazione al pserver CVS fallita" + +#, fuzzy +msgid "server sucks" +msgstr "il server fa schifo" + +msgid "%d bytes missing from remote file" +msgstr "%d byte mancanti dal file remoto" + +msgid "cvs server: %s\n" +msgstr "server cvs: %s\n" + +msgid "unknown CVS response: %s" +msgstr "risposta CVS sconosciuta: %s" + +msgid "collecting CVS rlog\n" +msgstr "sto collezionando gli rlog CVS\n" + +msgid "reading cvs log cache %s\n" +msgstr "sto leggendo la cache dei log cvs %s\n" + +msgid "cache has %d log entries\n" +msgstr "la cache ha %d voci di log\n" + +msgid "error reading cache: %r\n" +msgstr "errore durante la lettura della cache: %r\n" + +msgid "prefix=%r directory=%r root=%r\n" +msgstr "prefisso=%r directory=%r radice=%r\n" + +msgid "RCS file must be followed by working file" +msgstr "Il file RCS deve essere seguito da un file funzionante" + +msgid "must have at least some revisions" +msgstr "è necessario avere almeno alcune revisioni" + +msgid "expected revision number" +msgstr "numero di revisione atteso" + +msgid "revision must be followed by date line" +msgstr "la revisione deve essere seguita da una riga con la data" + +msgid "writing cvs log cache %s\n" +msgstr "" + +msgid "%d log entries\n" +msgstr "%d voci di log\n" + +msgid "creating changesets\n" +msgstr "sto creando i changeset\n" + +msgid "%d changeset entries\n" +msgstr "%d voci di changeset\n" + +msgid "Python ElementTree module is not available" +msgstr "il modulo Python ElementTree non è disponibile" + +msgid "cleaning up %s\n" +msgstr "sto ripulendo %s\n" + +msgid "internal calling inconsistency" +msgstr "" + +msgid "errors in filemap" +msgstr "errori nel filemap" + +msgid "%s:%d: %r already in %s list\n" +msgstr "%s:%d: %r esiste già nell'elenco %s\n" + +msgid "%s:%d: unknown directive %r\n" +msgstr "%s:%d: direttiva sconosciuta %r\n" + +msgid "source repository doesn't support --filemap" +msgstr "il repository sorgente non supporta --filemap" + +msgid "%s does not look like a GNU Arch repo" +msgstr "%s non sembra essere un repository GNU Arch" + +msgid "cannot find a GNU Arch tool" +msgstr "impossibile trovare un tool GNU Arch" + +msgid "analyzing tree version %s...\n" +msgstr "sto analizzando la versione dell'albero %s...\n" + +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "" + +msgid "applying revision %s...\n" +msgstr "sto applicando la revisione %s...\n" + +msgid "computing changeset between %s and %s...\n" +msgstr "sto calcolando il changeset tra %s e %s...\n" + +msgid "obtaining revision %s...\n" +msgstr "sto ottenendo la revisione %s...\n" + +msgid "analysing revision %s...\n" +msgstr "sto analizzando la revisione %s...\n" + +msgid "could not parse cat-log of %s" +msgstr "" + +msgid "%s is not a local Mercurial repo" +msgstr "%s non è un repository locale Mercurial" + +msgid "initializing destination %s repository\n" +msgstr "sto inizializzando il repository destinatario %s\n" + +msgid "run hg sink pre-conversion action\n" +msgstr "" + +msgid "run hg sink post-conversion action\n" +msgstr "" + +msgid "pulling from %s into %s\n" +msgstr "sto effettuando il pull da %s a %s\n" + +msgid "updating tags\n" +msgstr "sto aggiornando le tag\n" + +msgid "%s is not a valid start revision" +msgstr "%s non è una revisione iniziale valida" + +msgid "ignoring: %s\n" +msgstr "sto ignorando: %s\n" + +msgid "run hg source pre-conversion action\n" +msgstr "" + +msgid "run hg source post-conversion action\n" +msgstr "" + +msgid "%s does not look like a monotone repo" +msgstr "%s non sembra essere un repository monotone" + +msgid "copying file in renamed dir from '%s' to '%s'" +msgstr "" + +msgid "Subversion python bindings could not be loaded" +msgstr "Non è stato possibile caricare i binding python per Subversion" + +msgid "Subversion python bindings %d.%d found, 1.4 or later required" +msgstr "" +"Trovati binding python per Subversion %d.%d, richiesti 1.4 o successivi" + +msgid "Subversion python bindings are too old, 1.4 or later required" +msgstr "" +"I binding python per Subversion sono troppo vecchi, richiesti 1.4 o " +"successivi" + +msgid "svn: revision %s is not an integer" +msgstr "svn: la revisione %s non è un intero" + +msgid "svn: start revision %s is not an integer" +msgstr "svn: la revisione iniziale %s non è un intero" + +msgid "no revision found in module %s" +msgstr "nessuna revisione trovata nel modulo %s" + +msgid "expected %s to be at %r, but not found" +msgstr "mi aspettavo di trovare %s in %r, ma non esiste" + +msgid "found %s at %r\n" +msgstr "trovato %s in %r\n" + +msgid "ignoring empty branch %s\n" +msgstr "ignoro branch vuota %s\n" + +msgid "found branch %s at %d\n" +msgstr "trovata branch %s in %d\n" + +msgid "svn: start revision is not supported with with more than one branch" +msgstr "svn: non è supportata una revisione iniziale con più di una branch" + +msgid "svn: no revision found after start revision %d" +msgstr "svn: nessuna revisione trovata dopo la revisione iniziale %d" + +msgid "no tags found at revision %d\n" +msgstr "nessuna tag trovata alla revisione %d\n" + +msgid "ignoring foreign branch %r\n" +msgstr "ignoro la branch straniera %r\n" + +msgid "%s not found up to revision %d" +msgstr "%s non trovato fino alla revisione %d" + +msgid "branch renamed from %s to %s at %d\n" +msgstr "branch rinominata da %s a %s in %d\n" + +#, fuzzy +msgid "reparent to %s\n" +msgstr "riassociato il genitore come %s\n" + +msgid "copied to %s from %s@%s\n" +msgstr "copiato in %s da %s@%s\n" + +msgid "gone from %s\n" +msgstr "andato da %s\n" + +msgid "found parent directory %s\n" +msgstr "trovata directory genitore %s\n" + +msgid "base, entry %s %s\n" +msgstr "base, voce %s %s\n" + +msgid "munge-o-matic\n" +msgstr "" + +msgid "info: %s %s %s %s\n" +msgstr "info: %s %s %s %s\n" + +msgid "unknown path in revision %d: %s\n" +msgstr "percorso sconosciuto nella revisione %d: %s\n" + +msgid "mark %s came from %s:%d\n" +msgstr "%s marcato come proveniente da %s:%d\n" + +msgid "parsing revision %d (%d changes)\n" +msgstr "sto effettuando il parsing della revisione %d (%d modifiche)\n" + +msgid "found parent of branch %s at %d: %s\n" +msgstr "trovato genitore della branch %s in %d: %s\n" + +msgid "no copyfrom path, don't know what to do.\n" +msgstr "" + +msgid "fetching revision log for \"%s\" from %d to %d\n" +msgstr "" + +msgid "skipping blacklisted revision %d\n" +msgstr "sto saltando la revisione nella blacklist %d\n" + +msgid "revision %d has no entries\n" +msgstr "la revisione %d non ha voci\n" + +msgid "svn: branch has no revision %s" +msgstr "svn: la branch non ha nessuna revisione %s" + +msgid "%r is not under %r, ignoring\n" +msgstr "%r non è sotto %r, ignoro\n" + +msgid "initializing svn repo %r\n" +msgstr "inizializzo il repository svn %r\n" + +msgid "initializing svn wc %r\n" +msgstr "inizializzo svn wc %r\n" + +msgid "unexpected svn output:\n" +msgstr "output svn inatteso:\n" + +msgid "unable to cope with svn output" +msgstr "" + +msgid "XXX TAGS NOT IMPLEMENTED YET\n" +msgstr "XXX TAG NON ANCORA IMPLEMENTATE\n" + +msgid "(inotify: received response from incompatible server version %d)\n" +msgstr "" + +msgid "this system does not seem to support inotify" +msgstr "questo sistema sembra non supportare inotify" + +msgid "*** the current per-user limit on the number of inotify watches is %s\n" +msgstr "" + +msgid "*** this limit is too low to watch every directory in this repository\n" +msgstr "" + +msgid "*** counting directories: " +msgstr "*** sto contando le directory: " + +msgid "found %d\n" +msgstr "trovato %d\n" + +msgid "*** to raise the limit from %d to %d (run as root):\n" +msgstr "" + +msgid "*** echo %d > %s\n" +msgstr "*** echo %d > %s\n" + +msgid "cannot watch %s until inotify watch limit is raised" +msgstr "" +"impossibile controllare %s finchè il limite di controlli di inotify non " +"verrà aumentato" + +msgid "inotify service not available: %s" +msgstr "servizio inotify non disponibile: %s" + +msgid "watching %r\n" +msgstr "sto controllando %r\n" + +msgid "watching directories under %r\n" +msgstr "sto controllando le directory sotto %r\n" + +msgid "status: %r dir(%d) -> %s\n" +msgstr "status: %r dir(%d) -> %s\n" + +msgid "status: %r %s -> %s\n" +msgstr "status: %r %s -> %s\n" + +msgid "%s dirstate reload\n" +msgstr "" + +msgid "%s end dirstate reload\n" +msgstr "" + +msgid "rescanning due to .hgignore change\n" +msgstr "" + +msgid "%s event: created %s\n" +msgstr "evento %s: creato %s\n" + +msgid "%s event: deleted %s\n" +msgstr "evento %s: cancellato %s\n" + +msgid "%s event: modified %s\n" +msgstr "evento %s: modificato %s\n" + +msgid "filesystem containing %s was unmounted\n" +msgstr "il filesystem contenente %s era smontato\n" + +msgid "%s readable: %d bytes\n" +msgstr "%s leggibile: %d byte\n" + +msgid "%s below threshold - unhooking\n" +msgstr "" + +msgid "%s reading %d events\n" +msgstr "" + +msgid "%s hooking back up with %d bytes readable\n" +msgstr "" + +msgid "%s processing %d deferred events as %d\n" +msgstr "" + +msgid "could not start server: %s" +msgstr "" + +msgid "received query from incompatible client version %d\n" +msgstr "" + +msgid "answering query for %r\n" +msgstr "" + +msgid "finished setup\n" +msgstr "" + +msgid "polling: no timeout\n" +msgstr "" + +msgid "polling: %sms timeout\n" +msgstr "" + +msgid "archive prefix contains illegal components" +msgstr "" + +msgid "cannot give prefix when archiving to files" +msgstr "" + +msgid "unknown archive type '%s'" +msgstr "" + +msgid "invalid changegroup" +msgstr "" + +msgid "unknown parent" +msgstr "" + +msgid "integrity check failed on %s:%d" +msgstr "" + +msgid "%s: not a Mercurial bundle file" +msgstr "" + +msgid "%s: unknown bundle version" +msgstr "" + +msgid "%s: unknown bundle compression type" +msgstr "" + +msgid "cannot create new bundle repository" +msgstr "" + +msgid "premature EOF reading chunk (got %d bytes, expected %d)" +msgstr "" + +msgid "username %s contains a newline" +msgstr "" + +msgid "options --message and --logfile are mutually exclusive" +msgstr "" + +msgid "can't read commit message '%s': %s" +msgstr "" + +msgid "too many revisions specified" +msgstr "" + +msgid "invalid format spec '%%%s' in output file name" +msgstr "" + +msgid "recording removal of %s as rename to %s (%d%% similar)\n" +msgstr "" + +msgid "%s: not copying - file is not managed\n" +msgstr "" + +msgid "%s: not copying - file has been marked for remove\n" +msgstr "" + +msgid "%s: not overwriting - %s collides with %s\n" +msgstr "" + +msgid "%s: not overwriting - file exists\n" +msgstr "" + +msgid "%s: deleted in working copy\n" +msgstr "" + +msgid "%s: cannot copy - %s\n" +msgstr "%s: impossibile copiare - %s\n" + +msgid "%s %s to %s\n" +msgstr "%s %s in %s\n" + +msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" +msgstr "" + +msgid "no source or destination specified" +msgstr "nessuna sorgente o destinazione specificata" + +msgid "no destination specified" +msgstr "nessuna destinazione specificata" + +msgid "with multiple sources, destination must be an existing directory" +msgstr "" +"con sorgenti multiple la destinazione deve essere una directory esistente" + +msgid "destination %s is not a directory" +msgstr "la destinazione %s non è una directory" + +msgid "no files to copy" +msgstr "nessun file da copiare" + +msgid "(consider using --after)\n" +msgstr "(considera di usare --after)\n" + +msgid "changeset: %d:%s\n" +msgstr "changeset: %d:%s\n" + +msgid "branch: %s\n" +msgstr "branch: %s\n" + +msgid "tag: %s\n" +msgstr "tag: %s\n" + +msgid "parent: %d:%s\n" +msgstr "genitore: %d:%s\n" + +msgid "manifest: %d:%s\n" +msgstr "manifesto: %d:%s\n" + +msgid "user: %s\n" +msgstr "utente: %s\n" + +msgid "date: %s\n" +msgstr "data: %s\n" + +msgid "files+:" +msgstr "file+:" + +msgid "files-:" +msgstr "file-:" + +msgid "files:" +msgstr "file:" + +msgid "files: %s\n" +msgstr "file: %s\n" + +msgid "copies: %s\n" +msgstr "copie: %s\n" + +msgid "extra: %s=%s\n" +msgstr "extra: %s=%s\n" + +msgid "description:\n" +msgstr "descrizione:\n" + +msgid "summary: %s\n" +msgstr "sommario: %s\n" + +msgid "%s: no key named '%s'" +msgstr "%s: nessuna chiave chiamata '%s'" + +msgid "%s: %s" +msgstr "%s: %s" + +msgid "Found revision %s from %s\n" +msgstr "Trovata revisione %s da %s\n" + +msgid "revision matching date not found" +msgstr "revisione corrispondente alla data non trovata" + +msgid "cannot follow nonexistent file: \"%s\"" +msgstr "impossibile seguire il file non esistente: \"%s\"" + +msgid "%s:%s copy source revision cannot be found!\n" +msgstr "" + +msgid "can only follow copies/renames for explicit file names" +msgstr "" + +msgid "file %s not found!" +msgstr "file %s non trovato!" + +msgid "no match under directory %s!" +msgstr "nessuna corrispondenza sotto la directory %s!" + +msgid "can't commit %s: unsupported file type!" +msgstr "impossibile fare il commit di %s: tipo di file non supportato!" + +msgid "file %s not tracked!" +msgstr "il file %s non è tracciato!" + +msgid "not found in manifest" +msgstr "non trovato nel manifesto" + +msgid "branch name not in UTF-8!" +msgstr "il nome della branch non è in UTF-8!" + +msgid " searching for copies back to rev %d\n" +msgstr " sto cercando copie fino alla revisione %d\n" + +msgid "" +" unmatched files in local:\n" +" %s\n" +msgstr "" +" file non corrispondenti in locale:\n" +" %s\n" + +msgid "" +" unmatched files in other:\n" +" %s\n" +msgstr "" +" file non corrispondenti in altro:\n" +" %s\n" + +msgid " all copies found (* = to merge, ! = divergent):\n" +msgstr " trovate tutte le copie (* = per merge, ! = divergenti):\n" + +msgid " %s -> %s %s\n" +msgstr " %s -> %s %s\n" + +msgid " checking for directory renames\n" +msgstr " sto controllando directory rinominate\n" + +msgid " dir %s -> %s\n" +msgstr " dir %s -> %s\n" + +msgid " file %s -> %s\n" +msgstr " file %s -> %s\n" + +msgid "'\\n' and '\\r' disallowed in filenames: %r" +msgstr "'\\n' e '\\r' non sono consentiti nei nomi dei file: %r" + +msgid "directory %r already in dirstate" +msgstr "la directory %r è già nel dirstate" + +msgid "file %r in dirstate clashes with %r" +msgstr "il file %r nel dirstate collide con %r" + +msgid "not in dirstate: %s\n" +msgstr "non nel dirstate: %s\n" + +msgid "character device" +msgstr "device a caratteri" + +msgid "block device" +msgstr "device a blocchi" + +msgid "fifo" +msgstr "fifo" + +msgid "socket" +msgstr "socket" + +msgid "directory" +msgstr "directory" + +msgid "%s: unsupported file type (type is %s)\n" +msgstr "%s: tipo di file non supportato (il tipo è %s)\n" + +msgid "abort: %s\n" +msgstr "abortito: %s\n" + +msgid "" +"hg: command '%s' is ambiguous:\n" +" %s\n" +msgstr "" +"hg: il comando '%s' è ambiguo:\n" +" %s\n" + +msgid "timed out waiting for lock held by %s" +msgstr "tempo esaurito per l'attesa del lock tenuto da %s" + +msgid "lock held by %s" +msgstr "lock tenuto da %s" + +msgid "abort: %s: %s\n" +msgstr "abortito: %s: %s\n" + +msgid "abort: could not lock %s: %s\n" +msgstr "abortito: impossibile acquisire il lock su %s: %s\n" + +msgid "hg %s: %s\n" +msgstr "hg %s: %s\n" + +msgid "hg: %s\n" +msgstr "hg: %s\n" + +msgid "abort: %s!\n" +msgstr "abortito: %s!\n" + +msgid "abort: %s" +msgstr "abortito: %s" + +msgid " empty string\n" +msgstr "stringa vuota\n" + +msgid "killed!\n" +msgstr "ucciso!\n" + +msgid "hg: unknown command '%s'\n" +msgstr "hg: comando '%s' sconosciuto\n" + +msgid "abort: could not import module %s!\n" +msgstr "abortito: non è stato possibile importare %s!\n" + +msgid "(did you forget to compile extensions?)\n" +msgstr "(ti sei dimenticato di compilare le estensioni?)\n" + +msgid "(is your Python install correct?)\n" +msgstr "(l'installazione di Python è corretta?)\n" + +msgid "abort: error: %s\n" +msgstr "abortito: errore: %s\n" + +msgid "broken pipe\n" +msgstr "pipe rotta\n" + +msgid "interrupted!\n" +msgstr "interrotto!\n" + +msgid "" +"\n" +"broken pipe\n" +msgstr "" +"\n" +"pipe rotta\n" + +msgid "abort: out of memory\n" +msgstr "abortito: memoria esaurita\n" + +msgid "** unknown exception encountered, details follow\n" +msgstr "** incontrata eccezione sconosciuta, seguono dettagli\n" + +msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgstr "** riportare dettagli del bug a http://www.selenic.com/mercurial/bts\n" + +msgid "** or mercurial@selenic.com\n" +msgstr "** o mercurial@selenic.com\n" + +msgid "** Mercurial Distributed SCM (version %s)\n" +msgstr "** Mercurial SCM Distribuito (versione %s)\n" + +msgid "** Extensions loaded: %s\n" +msgstr "** Estensioni caricate: %s\n" + +msgid "malformed --config option: %s" +msgstr "opzione --config malformata: %s" + +msgid "extension '%s' overrides commands: %s\n" +msgstr "l'estensione '%s' rimpiazza i comandi: %s\n" + +msgid "Option --config may not be abbreviated!" +msgstr "Non si può abbreviare l'opzione --config!" + +msgid "Option --cwd may not be abbreviated!" +msgstr "Non si può abbreviare l'opzione --cwd!" + +msgid "" +"Option -R has to be separated from other options (i.e. not -qR) and --" +"repository may only be abbreviated as --repo!" +msgstr "" + +msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" +msgstr "" + +msgid "repository '%s' is not local" +msgstr "il repository '%s' non è locale" + +msgid "invalid arguments" +msgstr "argomenti non validi" + +msgid "exception raised - generating profile anyway\n" +msgstr "eccezione sollevata - genero comunque il profilo\n" + +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" + +msgid "*** failed to import extension %s from %s: %s\n" +msgstr "*** fallita l'importazione dell'estensione %s da %s: %s\n" + +msgid "*** failed to import extension %s: %s\n" +msgstr "*** fallita l'importazione dell'estensione %s: %s\n" + +msgid "couldn't find merge tool %s\n" +msgstr "non è stato possibile trovare il tool per il merge %s\n" + +msgid "tool %s can't handle symlinks\n" +msgstr "il tool %s non può gestire link simbolici\n" + +msgid "tool %s can't handle binary\n" +msgstr "il tool %s non può gestire file binari\n" + +msgid "tool %s requires a GUI\n" +msgstr "il tool %s richiede una GUI\n" + +msgid "picked tool '%s' for %s (binary %s symlink %s)\n" +msgstr "" + +msgid "" +" no tool found to merge %s\n" +"keep (l)ocal or take (o)ther?" +msgstr "" + +msgid "[lo]" +msgstr "[lo]" + +msgid "l" +msgstr "l" + +msgid "merging %s and %s to %s\n" +msgstr "" + +msgid "merging %s\n" +msgstr "sto effettuando il merge di %s\n" + +msgid "my %s other %s ancestor %s\n" +msgstr "mio %s altro %s antenato %s\n" + +msgid " premerge successful\n" +msgstr " premerge eseguito con successo\n" + +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +msgid "[yn]" +msgstr "[yn]" + +msgid "n" +msgstr "n" + +msgid "merging %s failed!\n" +msgstr "merge di %s fallito!\n" + +msgid "Inconsistent state, %s:%s is good and bad" +msgstr "" + +msgid "unknown bisect kind %s" +msgstr "" + +msgid "Date Formats" +msgstr "Formati della data" + +msgid "" +"\n" +" Some commands allow the user to specify a date:\n" +" backout, commit, import, tag: Specify the commit date.\n" +" log, revert, update: Select revision(s) by date.\n" +"\n" +" Many date formats are valid. Here are some examples:\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +" Lastly, there is Mercurial's internal format:\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +" This is the internal representation format for dates. unixtime is\n" +" the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n" +" is the offset of the local timezone, in seconds west of UTC (negative\n" +" if the timezone is east of UTC).\n" +"\n" +" The log command also accepts date ranges:\n" +"\n" +" \"<{date}\" - on or before a given date\n" +" \">{date}\" - on or after a given date\n" +" \"{date} to {date}\" - a date range, inclusive\n" +" \"-{days}\" - within a given number of days of today\n" +" " +msgstr "" + +msgid "File Name Patterns" +msgstr "Pattern dei Nomi dei File" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying one or more\n" +" files at a time.\n" +"\n" +" By default, Mercurial treats filenames as shell-style extended\n" +" glob patterns.\n" +"\n" +" Alternate pattern notations must be specified explicitly.\n" +"\n" +" To use a plain path name without any pattern matching, start a\n" +" name with \"path:\". These path names must match completely, from\n" +" the root of the current repository.\n" +"\n" +" To use an extended glob, start a name with \"glob:\". Globs are\n" +" rooted at the current directory; a glob such as \"*.c\" will match\n" +" files ending in \".c\" in the current directory only.\n" +"\n" +" The supported glob syntax extensions are \"**\" to match any string\n" +" across path separators, and \"{a,b}\" to mean \"a or b\".\n" +"\n" +" To use a Perl/Python regular expression, start a name with \"re:\".\n" +" Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +" Plain examples:\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root of\n" +" the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +" Glob examples:\n" +"\n" +" glob:*.c any name ending in \".c\" in the current directory\n" +" *.c any name ending in \".c\" in the current directory\n" +" **.c any name ending in \".c\" in the current directory, or\n" +" any subdirectory\n" +" foo/*.c any name ending in \".c\" in the directory foo\n" +" foo/**.c any name ending in \".c\" in the directory foo, or any\n" +" subdirectory\n" +"\n" +" Regexp examples:\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +"\n" +" " +msgstr "" + +msgid "Environment Variables" +msgstr "Variabili d'ambiente" + +msgid "" +"\n" +"HG::\n" +" Path to the 'hg' executable, automatically passed when running hooks,\n" +" extensions or external tools. If unset or empty, an executable named\n" +" 'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n" +"\n" +"HGEDITOR::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING::\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE::\n" +" This sets Mercurial's behavior for handling unknown characters\n" +" while transcoding user inputs. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't translate a character. Other\n" +" settings include \"replace\", which replaces unknown characters, and\n" +" \"ignore\", which drops them. This setting can be overridden with\n" +" the --encodingmode command-line option.\n" +"\n" +"HGMERGE::\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGRCPATH::\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only .hg/hgrc of\n" +" current repository is read.\n" +"\n" +" For each element in path, if a directory, all entries in directory\n" +" ending with \".rc\" are added to path. Else, element itself is\n" +" added to path.\n" +"\n" +"HGUSER::\n" +" This is the string used for the author of a commit.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL::\n" +" If HGUSER is not set, this will be used as the author for a commit.\n" +"\n" +"LOGNAME::\n" +" If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n" +" '@hostname' appended) as the author value for a commit.\n" +"\n" +"VISUAL::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"EDITOR::\n" +" Sometimes Mercurial needs to open a text file in an editor\n" +" for a user to modify, for example when writing commit messages.\n" +" The editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH::\n" +" This is used by Python to find imported modules and may need to be set\n" +" appropriately if Mercurial is not installed system-wide.\n" +" " +msgstr "" + +msgid "Specifying Single Revisions" +msgstr "" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying individual\n" +" revisions.\n" +"\n" +" A plain integer is treated as a revision number. Negative\n" +" integers are treated as offsets from the tip, with -1 denoting the\n" +" tip.\n" +"\n" +" A 40-digit hexadecimal string is treated as a unique revision\n" +" identifier.\n" +"\n" +" A hexadecimal string less than 40 characters long is treated as a\n" +" unique revision identifier, and referred to as a short-form\n" +" identifier. A short-form identifier is only valid if it is the\n" +" prefix of one full-length identifier.\n" +"\n" +" Any other string is treated as a tag name, which is a symbolic\n" +" name associated with a revision identifier. Tag names may not\n" +" contain the \":\" character.\n" +"\n" +" The reserved name \"tip\" is a special tag that always identifies\n" +" the most recent revision.\n" +"\n" +" The reserved name \"null\" indicates the null revision. This is the\n" +" revision of an empty repository, and the parent of revision 0.\n" +"\n" +" The reserved name \".\" indicates the working directory parent. If\n" +" no working directory is checked out, it is equivalent to null.\n" +" If an uncommitted merge is in progress, \".\" is the revision of\n" +" the first parent.\n" +" " +msgstr "" + +msgid "Specifying Multiple Revisions" +msgstr "" + +msgid "" +"\n" +" When Mercurial accepts more than one revision, they may be\n" +" specified individually, or provided as a continuous range,\n" +" separated by the \":\" character.\n" +"\n" +" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" +" are revision identifiers. Both BEGIN and END are optional. If\n" +" BEGIN is not specified, it defaults to revision number 0. If END\n" +" is not specified, it defaults to the tip. The range \":\" thus\n" +" means \"all revisions\".\n" +"\n" +" If BEGIN is greater than END, revisions are treated in reverse\n" +" order.\n" +"\n" +" A range acts as a closed interval. This means that a range of 3:5\n" +" gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.\n" +" " +msgstr "" + +msgid "Diff Formats" +msgstr "Formati di diff" + +msgid "" +"\n" +" Mercurial's default format for showing changes between two versions\n" +" of a file is compatible with the unified format of GNU diff, which\n" +" can be used by GNU patch and many other standard tools.\n" +"\n" +" While this standard format is often enough, it does not encode the\n" +" following information:\n" +"\n" +" - executable status\n" +" - copy or rename information\n" +" - changes in binary files\n" +" - creation or deletion of empty files\n" +"\n" +" Mercurial also supports the extended diff format from the git VCS\n" +" which addresses these limitations. The git diff format is not\n" +" produced by default because there are very few tools which\n" +" understand this format.\n" +"\n" +" This means that when generating diffs from a Mercurial repository\n" +" (e.g. with \"hg export\"), you should be careful about things like\n" +" file copies and renames or other things mentioned above, because\n" +" when applying a standard diff to a different repository, this extra\n" +" information is lost. Mercurial's internal operations (like push and\n" +" pull) are not affected by this, because they use an internal binary\n" +" format for communicating changes.\n" +"\n" +" To make Mercurial produce the git extended diff format, use the\n" +" --git option available for many commands, or set 'git = True' in the\n" +" [diff] section of your hgrc. You do not need to set this option when\n" +" importing diffs in this format or using them in the mq extension.\n" +" " +msgstr "" + +msgid "destination directory: %s\n" +msgstr "directory di destinazione: %s\n" + +msgid "destination '%s' already exists" +msgstr "la destinazione '%s' esiste già" + +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" +msgstr "" + +msgid "clone from remote to remote not supported" +msgstr "clone da remoto a remoto non supportato" + +msgid "updating working directory\n" +msgstr "sto aggiornando la directory di lavoro\n" + +msgid "updated" +msgstr "aggiornato" + +msgid "merged" +msgstr "merge" + +msgid "removed" +msgstr "rimosso" + +msgid "unresolved" +msgstr "non risolto" + +msgid "%d files %s" +msgstr "%d file %s" + +msgid "use 'hg resolve' to retry unresolved file merges\n" +msgstr "usa 'hg resolve' per riprovare i merge sui file non risolti\n" + +msgid "(branch merge, don't forget to commit)\n" +msgstr "(merge su branch, non dimenticare di effettuare il commit)\n" + +msgid "error reading %s/.hg/hgrc: %s\n" +msgstr "errore di lettura di %s/.hg/hgrc: %s\n" + +msgid "SSL support is unavailable" +msgstr "Supporto SSL non disponibile" + +msgid "IPv6 not available on this system" +msgstr "IPv6 non disponibile su questo sistema" + +msgid "cannot start server at '%s:%d': %s" +msgstr "impossibile avviare il server a '%s:%d': %s" + +msgid "calling hook %s: %s\n" +msgstr "sto invocando l'hook %s: %s\n" + +msgid "%s hook is invalid (\"%s\" not in a module)" +msgstr "l'hook %s non è valido (\"%s\" non in un modulo)" + +msgid "%s hook is invalid (import of \"%s\" failed)" +msgstr "" + +msgid "%s hook is invalid (\"%s\" is not defined)" +msgstr "" + +msgid "%s hook is invalid (\"%s\" is not callable)" +msgstr "" + +msgid "error: %s hook failed: %s\n" +msgstr "" + +msgid "error: %s hook raised an exception: %s\n" +msgstr "" + +msgid "%s hook failed" +msgstr "" + +msgid "warning: %s hook failed\n" +msgstr "" + +msgid "running hook %s: %s\n" +msgstr "" + +msgid "%s hook %s" +msgstr "" + +msgid "warning: %s hook %s\n" +msgstr "" + +msgid "connection ended unexpectedly" +msgstr "" + +msgid "unsupported URL component: \"%s\"" +msgstr "" + +msgid "using %s\n" +msgstr "" + +msgid "capabilities: %s\n" +msgstr "" + +msgid "operation not supported over http" +msgstr "" + +msgid "sending %s command\n" +msgstr "" + +msgid "sending %s bytes\n" +msgstr "" + +msgid "authorization failed" +msgstr "" + +msgid "http error while sending %s command\n" +msgstr "" + +msgid "http error, possibly caused by proxy setting" +msgstr "" + +msgid "real URL is %s\n" +msgstr "" + +msgid "Requested URL: '%s'\n" +msgstr "" + +msgid "'%s' does not appear to be an hg repository" +msgstr "" + +msgid "'%s' sent a broken Content-Type header (%s)" +msgstr "" + +msgid "'%s' uses newer protocol %s" +msgstr "" + +msgid "look up remote revision" +msgstr "" + +msgid "unexpected response:" +msgstr "" + +msgid "look up remote changes" +msgstr "" + +msgid "push failed (unexpected response):" +msgstr "" + +msgid "push failed: %s" +msgstr "" + +msgid "Python support for SSL and HTTPS is not installed" +msgstr "" + +msgid "cannot create new http repository" +msgstr "" + +msgid "%s: ignoring invalid syntax '%s'\n" +msgstr "" + +msgid "skipping unreadable ignore file '%s': %s\n" +msgstr "" + +msgid "repository %s not found" +msgstr "repository %s non trovato" + +msgid "repository %s already exists" +msgstr "" + +msgid "requirement '%s' not supported" +msgstr "" + +msgid "%r cannot be used in a tag name" +msgstr "" + +msgid "working copy of .hgtags is changed (please commit .hgtags manually)" +msgstr "" + +msgid "%s, line %s: %s\n" +msgstr "" + +msgid "cannot parse entry" +msgstr "" + +msgid "node '%s' is not well formed" +msgstr "" + +msgid "tag '%s' refers to unknown node" +msgstr "" + +msgid "unknown revision '%s'" +msgstr "" + +msgid "filtering %s through %s\n" +msgstr "" + +msgid "journal already exists - run hg recover" +msgstr "" + +msgid "rolling back interrupted transaction\n" +msgstr "" + +msgid "no interrupted transaction available\n" +msgstr "" + +msgid "rolling back last transaction\n" +msgstr "" + +msgid "Named branch could not be reset, current branch still is: %s\n" +msgstr "" + +msgid "no rollback information available\n" +msgstr "" + +msgid "waiting for lock on %s held by %r\n" +msgstr "" + +msgid "repository %s" +msgstr "" + +msgid "working directory of %s" +msgstr "" + +msgid " %s: searching for copy revision for %s\n" +msgstr "" + +msgid " %s: copy %s:%s\n" +msgstr "" + +msgid "cannot partially commit a merge (do not specify files or patterns)" +msgstr "" + +msgid "%s not tracked!\n" +msgstr "" + +msgid "unresolved merge conflicts (see hg resolve)" +msgstr "" + +msgid "closing the default branch is invalid" +msgstr "" + +msgid "nothing changed\n" +msgstr "" + +msgid "trouble committing %s!\n" +msgstr "" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "" + +msgid "empty commit message" +msgstr "" + +msgid "%s does not exist!\n" +msgstr "" + +msgid "" +"%s: files over 10MB may cause memory and performance problems\n" +"(use 'hg revert %s' to unadd the file)\n" +msgstr "" + +msgid "%s not added: only files and symlinks supported currently\n" +msgstr "" + +msgid "%s already tracked!\n" +msgstr "" + +msgid "%s not added!\n" +msgstr "" + +msgid "%s still exists!\n" +msgstr "" + +msgid "%s not removed!\n" +msgstr "" + +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "" + +msgid "searching for changes\n" +msgstr "" + +msgid "examining %s:%s\n" +msgstr "" + +msgid "branch already found\n" +msgstr "" + +msgid "found incomplete branch %s:%s\n" +msgstr "" + +msgid "found new changeset %s\n" +msgstr "" + +msgid "request %d: %s\n" +msgstr "" + +msgid "received %s:%s\n" +msgstr "" + +msgid "narrowing %d:%d %s\n" +msgstr "" + +msgid "found new branch changeset %s\n" +msgstr "" + +msgid "narrowed branch search to %s:%s\n" +msgstr "" + +msgid "already have changeset " +msgstr "" + +msgid "warning: repository is unrelated\n" +msgstr "" + +msgid "repository is unrelated" +msgstr "" + +msgid "found new changesets starting at " +msgstr "" + +msgid "%d total queries\n" +msgstr "" + +msgid "common changesets up to " +msgstr "" + +msgid "requesting all changes\n" +msgstr "" + +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." +msgstr "" + +msgid "abort: push creates new remote heads!\n" +msgstr "" + +msgid "(did you forget to merge? use push -f to force)\n" +msgstr "" + +msgid "note: unsynced remote changes!\n" +msgstr "" + +msgid "%d changesets found\n" +msgstr "" + +msgid "list of changesets:\n" +msgstr "" + +msgid "empty or missing revlog for %s" +msgstr "" + +msgid "add changeset %s\n" +msgstr "" + +msgid "adding changesets\n" +msgstr "" + +msgid "received changelog group is empty" +msgstr "" + +msgid "adding manifests\n" +msgstr "" + +msgid "adding file changes\n" +msgstr "" + +msgid "adding %s revisions\n" +msgstr "" + +msgid "received file revlog group is empty" +msgstr "" + +msgid " (%+d heads)" +msgstr "" + +msgid "added %d changesets with %d changes to %d files%s\n" +msgstr "" + +msgid "updating the branch cache\n" +msgstr "" + +msgid "Unexpected response from remote server:" +msgstr "" + +msgid "operation forbidden by server" +msgstr "" + +msgid "locking the remote repository failed" +msgstr "" + +msgid "the server sent an unknown error code" +msgstr "" + +msgid "streaming all changes\n" +msgstr "" + +msgid "%d files to transfer, %s of data\n" +msgstr "" + +msgid "adding %s (%s)\n" +msgstr "" + +msgid "transferred %s in %.1f seconds (%s/sec)\n" +msgstr "" + +msgid "no [smtp]host in hgrc - cannot send mail" +msgstr "" + +msgid "sending mail: smtp host %s, port %s\n" +msgstr "" + +msgid "can't use TLS: Python SSL support not installed" +msgstr "" + +msgid "(using tls)\n" +msgstr "" + +msgid "(authenticating to mail server as %s)\n" +msgstr "" + +msgid "sending mail: %s\n" +msgstr "" + +msgid "smtp specified as email transport, but no smtp host configured" +msgstr "" + +msgid "%r specified as email transport, but not in PATH" +msgstr "" + +msgid "ignoring invalid sendcharset: %s\n" +msgstr "" + +msgid "invalid email address: %s" +msgstr "" + +msgid "invalid local address: %s" +msgstr "" + +msgid "'\\n' and '\\r' disallowed in filenames" +msgstr "" + +msgid "failed to remove %s from manifest" +msgstr "" + +msgid "diff context lines count must be an integer, not %r" +msgstr "" + +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" +msgstr "" + +msgid "case-folding collision between %s and %s" +msgstr "" + +msgid "resolving manifests\n" +msgstr "sto risolvendo i manifesti\n" + +msgid " overwrite %s partial %s\n" +msgstr "sovrascrivi %s parziale %s\n" + +msgid " ancestor %s local %s remote %s\n" +msgstr "antenato %s locale %s remoto %s\n" + +msgid "" +" conflicting flags for %s\n" +"(n)one, e(x)ec or sym(l)ink?" +msgstr "" + +msgid "" +" local changed %s which remote deleted\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +msgid "[cd]" +msgstr "" + +msgid "c" +msgstr "" + +msgid "" +"remote changed %s which local deleted\n" +"use (c)hanged version or leave (d)eleted?" +msgstr "" + +msgid "preserving %s for resolve of %s\n" +msgstr "" + +msgid "update failed to remove %s: %s!\n" +msgstr "" + +msgid "getting %s\n" +msgstr "" + +msgid "moving %s to %s\n" +msgstr "" + +msgid "getting %s to %s\n" +msgstr "" + +msgid "warning: detected divergent renames of %s to:\n" +msgstr "" + +msgid "branch %s not found" +msgstr "" + +msgid "can't merge with ancestor" +msgstr "" + +msgid "nothing to merge (use 'hg update' or check 'hg heads')" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C')" +msgstr "" + +msgid "crosses named branches (use 'hg update -C' to discard changes)" +msgstr "" + +msgid "cannot create %s: destination already exists" +msgstr "" + +msgid "cannot create %s: unable to create destination directory" +msgstr "" + +msgid "found patch at byte %d\n" +msgstr "" + +msgid "patch generated by hg export\n" +msgstr "" + +msgid "unable to find '%s' for patching\n" +msgstr "" + +msgid "patching file %s\n" +msgstr "" + +msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" +msgstr "" + +msgid "bad hunk #%d %s (%d %d %d %d)" +msgstr "" + +msgid "file %s already exists\n" +msgstr "" + +msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" +msgstr "" + +msgid "Hunk #%d FAILED at %d\n" +msgstr "" + +msgid "bad hunk #%d" +msgstr "" + +msgid "bad hunk #%d old text line %d" +msgstr "" + +msgid "could not extract binary patch" +msgstr "" + +msgid "binary patch is %d bytes, not %d" +msgstr "" + +msgid "unable to strip away %d dirs from %s" +msgstr "" + +msgid "undefined source and destination files" +msgstr "" + +msgid "malformed patch %s %s" +msgstr "" + +msgid "unsupported parser state: %s" +msgstr "" + +msgid "patch command failed: %s" +msgstr "" + +msgid "no valid hunks found; trying with %r instead\n" +msgstr "" + +msgid "saving bundle to %s\n" +msgstr "" + +msgid "adding branch\n" +msgstr "" + +msgid "cannot %s; remote repository does not support the %r capability" +msgstr "" + +msgid "unknown compression type %r" +msgstr "" + +msgid "index %s unknown flags %#04x for format v0" +msgstr "" + +msgid "index %s unknown flags %#04x for revlogng" +msgstr "" + +msgid "index %s unknown format %d" +msgstr "" + +msgid "no node" +msgstr "" + +msgid "ambiguous identifier" +msgstr "" + +msgid "no match found" +msgstr "" + +msgid "incompatible revision flag %x" +msgstr "" + +msgid "%s not found in the transaction" +msgstr "" + +msgid "unknown base" +msgstr "" + +msgid "consistency error adding group" +msgstr "" + +msgid "%s looks like a binary file." +msgstr "" + +msgid "can only specify two labels." +msgstr "" + +msgid "warning: conflicts during merge.\n" +msgstr "" + +msgid "couldn't parse location %s" +msgstr "" + +msgid "could not create remote repo" +msgstr "" + +msgid "remote: " +msgstr "" + +msgid "no suitable response from remote hg" +msgstr "" + +msgid "push refused: %s" +msgstr "" + +msgid "unsynced changes" +msgstr "" + +msgid "cannot lock static-http repository" +msgstr "" + +msgid "cannot create new static-http repository" +msgstr "" + +msgid "invalid entry in fncache, line %s" +msgstr "" + +msgid "scanning\n" +msgstr "" + +msgid "%d files, %d bytes to transfer\n" +msgstr "" + +msgid "sending %s (%d bytes)\n" +msgstr "" + +msgid "unmatched quotes" +msgstr "" + +msgid "style not found: %s" +msgstr "" + +msgid "%s:%s: parse error" +msgstr "" + +msgid "template file %s: %s" +msgstr "" + +msgid "Error expanding '%s%%%s'" +msgstr "" + +msgid "transaction abort!\n" +msgstr "transazione abortita!\n" + +msgid "failed to truncate %s\n" +msgstr "" + +msgid "rollback completed\n" +msgstr "rollback completato\n" + +msgid "Not trusting file %s from untrusted user %s, group %s\n" +msgstr "" + +msgid "" +"Failed to parse %s\n" +"%s" +msgstr "" +"Fallita la parsificazione di %s\n" +"%s" + +msgid "Ignored: %s\n" +msgstr "Ignorato: %s\n" + +msgid "unable to open %s: %s" +msgstr "impossibile aprire %s: %s" + +msgid "" +"failed to parse %s\n" +"%s" +msgstr "" +"fallita la parsificazione di %s\n" +"%s" + +msgid "" +"Error in configuration section [%s] parameter '%s':\n" +"%s" +msgstr "" +"Errore nella sezione di configurazione [%s] parametro '%s':\n" +"%s" + +msgid "Ignoring untrusted configuration option %s.%s = %s\n" +msgstr "Ignoro l'opzione di configurazione non affidabile %s.%s = %s\n" + +msgid "" +"Error in configuration section [%s]:\n" +"%s" +msgstr "" +"Errore nella sezione di configurazione [%s]:\n" +"%s" + +msgid "enter a commit username:" +msgstr "inserire uno username per il commit:" + +msgid "No username found, using '%s' instead\n" +msgstr "Nessuno username trovato, uso '%s' invece\n" + +msgid "Please specify a username." +msgstr "Si prega di specificare uno username." + +msgid "username %s contains a newline\n" +msgstr "lo username %s contiene un carattere di fine riga\n" + +msgid "unrecognized response\n" +msgstr "risposta non riconosciuta\n" + +msgid "response expected" +msgstr "risposta attesa" + +msgid "password: " +msgstr "password: " + +msgid "edit failed" +msgstr "modifica fallita" + +msgid "http authorization required" +msgstr "autorizzazione http richiesta" + +msgid "http authorization required\n" +msgstr "autorizzazione http richiesta\n" + +msgid "realm: %s\n" +msgstr "reame: %s\n" + +msgid "user: %s\n" +msgstr "utente: %s\n" + +msgid "user:" +msgstr "utente:" + +msgid "proxying through http://%s:%s\n" +msgstr "usando proxy attraverso http://%s:%s\n" + +msgid "http auth: user %s, password %s\n" +msgstr "autenticazione http: utente %s, password %s\n" + +msgid "%s, please check your locale settings" +msgstr "%s, si prega di controllare le impostazioni di localizzazione" + +msgid "command '%s' failed: %s" +msgstr "comando '%s' fallito: %s" + +msgid "path contains illegal component: %s" +msgstr "il percorso contiene un componente non consentito: %s" + +msgid "path %r is inside repo %r" +msgstr "il percorso %r all'interno del repository %r" + +msgid "path %r traverses symbolic link %r" +msgstr "il percorso %r attraversa il link simbolico %r" + +msgid "Hardlinks not supported" +msgstr "Hardlink non supportati" + +msgid "user name not available - set USERNAME environment variable" +msgstr "" +"nome utente non disponibile - impostare la variabile d'ambiente USERNAME" + +msgid "exited with status %d" +msgstr "uscito con status %d" + +msgid "killed by signal %d" +msgstr "ucciso dal segnale %d" + +msgid "stopped by signal %d" +msgstr "terminato dal segnale %d" + +msgid "invalid exit code" +msgstr "codice d'uscita non valido" + +msgid "could not symlink to %r: %s" +msgstr "impossibile creare un link simbolico a %r: %s" + +msgid "invalid date: %r " +msgstr "data non valida: %r " + +msgid "date exceeds 32 bits: %d" +msgstr "la data supera i 32 bit: %d" + +msgid "impossible time zone offset: %d" +msgstr "fuso orario impossibile: %d" + +msgid "invalid day spec: %s" +msgstr "" + +msgid "%.0f GB" +msgstr "%.0f GB" + +msgid "%.1f GB" +msgstr "%.1f GB" + +msgid "%.2f GB" +msgstr "%.2f GB" + +msgid "%.0f MB" +msgstr "%.0f MB" + +msgid "%.1f MB" +msgstr "%.1f MB" + +msgid "%.2f MB" +msgstr "%.2f MB" + +msgid "%.0f KB" +msgstr "%.0f KB" + +msgid "%.1f KB" +msgstr "%.1f KB" + +msgid "%.2f KB" +msgstr "%.2f KB" + +msgid "%.0f bytes" +msgstr "%.0f byte" + +msgid "cannot verify bundle or remote repos" +msgstr "impossibile verificare bundle o repository remoti" + +msgid "interrupted" +msgstr "interrotto" + +msgid "empty or missing %s" +msgstr "%s vuoto o mancante" + +msgid "data length off by %d bytes" +msgstr "" + +msgid "index contains %d extra bytes" +msgstr "l'indice contiene %d extra byte" + +msgid "warning: `%s' uses revlog format 1" +msgstr "attenzione: `%s' usa il formato di revlog 1" + +msgid "warning: `%s' uses revlog format 0" +msgstr "attenzione: `%s' usa il formato di revlog 0" + +msgid "rev %d point to %s changeset %d" +msgstr "rev %d punta a %s changeset %d" + +msgid " (expected %s)" +msgstr "(atteso %s)" + +msgid "unknown parent 1 %s of %s" +msgstr "genitore 1 %s di %s sconosciuto" + +msgid "unknown parent 2 %s of %s" +msgstr "genitore 2 %s di %s sconosciuto" + +msgid "checking parents of %s" +msgstr "sto controllando i genitori di %s" + +msgid "duplicate revision %d (%d)" +msgstr "revisione duplicata %d (%d)" + +msgid "repository uses revlog format %d\n" +msgstr "il repository usa il formato di revlog %d\n" + +msgid "checking changesets\n" +msgstr "sto controllando i changeset\n" + +msgid "unpacking changeset %s" +msgstr "sto spacchettando il changeset %s" + +msgid "checking manifests\n" +msgstr "sto controllando i manifesti\n" + +msgid "file without name in manifest" +msgstr "file senza nome nel manifesto" + +msgid "reading manifest delta %s" +msgstr "sto leggendo il delta del manifesto %s" + +msgid "crosschecking files in changesets and manifests\n" +msgstr "" +"sto facendo un controllo incrociato sui file nei changeset e nei manifesti\n" + +msgid "changeset refers to unknown manifest %s" +msgstr "il changeset si riferisce ad un manifesto sconosciuto %s" + +msgid "in changeset but not in manifest" +msgstr "nel changeset ma non nel manifesto" + +msgid "in manifest but not in changeset" +msgstr "nel manifesto ma non nel changeset" + +msgid "checking files\n" +msgstr "sto controllando i file\n" + +msgid "cannot decode filename '%s'" +msgstr "" + +msgid "missing revlog!" +msgstr "revlog mancante!" + +msgid "%s not in manifests" +msgstr "%s non è nei manifesti" + +msgid "unpacked size is %s, %s expected" +msgstr "la dimensione spacchettata è %s, attesa %s" + +msgid "unpacking %s" +msgstr "sto spacchettando %s" + +msgid "empty or missing copy source revlog %s:%s" +msgstr "" + +msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgstr "" + +msgid "checking rename of %s" +msgstr "sto controllando la rinomina di %s" + +msgid "%s in manifests not found" +msgstr "%s non trovato nei manifesti" + +msgid "warning: orphan revlog '%s'" +msgstr "attenzione: revlog '%s' orfano" + +msgid "%d files, %d changesets, %d total revisions\n" +msgstr "%d file, %d changeset, %d revisioni totali\n" + +msgid "%d warnings encountered!\n" +msgstr "%d warning incontrati!\n" + +msgid "%d integrity errors encountered!\n" +msgstr "%d errori di integrit incontrati!\n" + +msgid "(first damaged changeset appears to be %d)\n" +msgstr "(il primo changeset danneggiato sembra essere %d)\n"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/i18n/ja.po Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,9779 @@ +# Japanese translation for Mercurial +# Mercurial 日本語翻訳 +# +# Copyright (C) 2009 the Mercurial team +# +# Translation dictionary: +# +# Distributed SCM 分散構成管理ツール +# +# add (構成管理への)追加登録 +# apply 適用 +# archive アーカイブ +# (with no)argument(s) 引数(指定が無い場合) +# author 作成者 +# backout 打ち消し +# basename ベース名 +# branch ブランチ +# bundle( file) バンドルファイル +# changegroup( file) バンドルファイル +# change(set) チェンジセット +# changeset hash ハッシュ値 +# changeset header ヘッダ情報 +# checkout/update (作業領域の)更新 +# (this)command (本)コマンド +# commit コミット +# commit comment コミットログ +# (by)default 指定が無い場合/通常は +# delete/remove (構成管理からの)登録除外 +# diff 差分 +# dirstate dirstate +# extend(ed) 拡張 +# extensiohn (Mercurialの)エクステンション +# hash identifier(s) ハッシュ値 +# head ヘッド +# head changeset(s) ヘッド +# (revision)history 変更履歴 +# import 取り込み +# list of .... 列挙された..../.... の一覧 +# manifest マニフェスト +# merge マージ +# note 備考 +# patch パッチ +# platform 稼働環境 +# pull (追加リビジョンの)取り込み +# push (追加リビジョンの)反映 +# remote(repo) 連携先(リポジトリ) +# rename 改名 +# repo(sitory) リポジトリ +# revert/undo 取り消し +# revision リビジョン +# schedule (add/remove の)予約 +# search 探索 +# summary 要約(情報) +# tag タグ +# working directory 作業領域 +# +msgid "" +msgstr "" +"Project-Id-Version: Mercurial\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-21 01:58+0900\n" +"PO-Revision-Date: 2009-02-21 02:00+0900\n" +"Last-Translator: FUJIWARA Katsunori <foozy@lares.dti.ne.jp>\n" +"Language-Team: Japanese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#, python-format +msgid " (default: %s)" +msgstr " (規定値: %s)" + +msgid "OPTIONS" +msgstr "" + +msgid "COMMANDS" +msgstr "" + +msgid " options:\n" +msgstr "" + +#, python-format +msgid "" +" aliases: %s\n" +"\n" +msgstr "" + +msgid "return tuple of (match function, list enabled)." +msgstr "" + +#, python-format +msgid "acl: %s not enabled\n" +msgstr "" + +#, python-format +msgid "acl: %s enabled, %d entries for user %s\n" +msgstr "" + +#, python-format +msgid "config error - hook type \"%s\" cannot stop incoming changesets" +msgstr "" + +#, python-format +msgid "acl: changes have source \"%s\" - skipping\n" +msgstr "" + +#, python-format +msgid "acl: user %s denied on %s\n" +msgstr "" + +#, python-format +msgid "acl: access denied for changeset %s" +msgstr "" + +#, python-format +msgid "acl: user %s not allowed on %s\n" +msgstr "" + +#, python-format +msgid "acl: allowing changeset %s\n" +msgstr "" + +msgid "" +"allow user-defined command aliases\n" +"\n" +"To use, create entries in your hgrc of the form\n" +"\n" +"[alias]\n" +"mycmd = cmd --args\n" +msgstr "" + +msgid "" +"defer command lookup until needed, so that extensions loaded\n" +" after alias can be aliased" +msgstr "" + +#, python-format +msgid "*** [alias] %s: command %s is unknown" +msgstr "" + +#, python-format +msgid "*** [alias] %s: command %s is ambiguous" +msgstr "" + +#, python-format +msgid "*** [alias] %s: circular dependency on %s" +msgstr "" + +#, python-format +msgid "*** [alias] %s: no definition\n" +msgstr "" + +msgid "" +"mercurial bookmarks\n" +"\n" +"Mercurial bookmarks are local moveable pointers to changesets. Every\n" +"bookmark points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it, the\n" +"bookmark is forwarded to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup (e.g. hg\n" +"merge, hg update).\n" +"\n" +"The bookmark extension offers the possiblity to have a more git-like " +"experience\n" +"by adding the following configuration option to your .hgrc:\n" +"\n" +"[bookmarks]\n" +"track.current = True\n" +"\n" +"This will cause bookmarks to track the bookmark that you are currently on, " +"and\n" +"just updates it. This is similar to git's approach of branching.\n" +msgstr "" + +msgid "" +"Parse .hg/bookmarks file and return a dictionary\n" +"\n" +" Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n" +" in the .hg/bookmarks file. They are read by the parse() method and\n" +" returned as a dictionary with name => hash values.\n" +"\n" +" The parsed dictionary is cached until a write() operation is done.\n" +" " +msgstr "" + +msgid "" +"Write bookmarks\n" +"\n" +" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" +" in a format equal to those of localtags.\n" +"\n" +" We also store a backup of the previous state in undo.bookmarks that\n" +" can be copied back on rollback.\n" +" " +msgstr "" + +msgid "" +"Get the current bookmark\n" +"\n" +" If we use gittishsh branches we have a current bookmark that\n" +" we are on. This function returns the name of the bookmark. It\n" +" is stored in .hg/bookmarks.current\n" +" " +msgstr "" + +msgid "" +"Set the name of the bookmark that we are currently on\n" +"\n" +" Set the name of the bookmark that we are on (hg update <bookmark>).\n" +" The name is recoreded in .hg/bookmarks.current\n" +" " +msgstr "" + +msgid "" +"mercurial bookmarks\n" +"\n" +" Bookmarks are pointers to certain commits that move when\n" +" commiting. Bookmarks are local. They can be renamed, copied and\n" +" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n" +" update' to update to a given bookmark.\n" +"\n" +" You can use 'hg bookmark NAME' to set a bookmark on the current\n" +" tip with the given name. If you specify a revision using -r REV\n" +" (where REV may be an existing bookmark), the bookmark is set to\n" +" that revision.\n" +" " +msgstr "" + +msgid "a bookmark of this name does not exist" +msgstr "" + +msgid "a bookmark of the same name already exists" +msgstr "" + +msgid "new bookmark name required" +msgstr "" + +msgid "bookmark name required" +msgstr "" + +msgid "bookmark name cannot contain newlines" +msgstr "" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "" + +msgid "" +"Strip bookmarks if revisions are stripped using\n" +" the mercurial.strip method. This usually happens during\n" +" qpush and qpop" +msgstr "" + +msgid "" +"Add a revision to the repository and\n" +" move the bookmark" +msgstr "" + +msgid "Merge bookmarks with normal tags" +msgstr "" + +msgid "" +"Set the current bookmark\n" +"\n" +" If the user updates to a bookmark we update the .hg/bookmarks.current\n" +" file.\n" +" " +msgstr "" + +msgid "force" +msgstr "" + +msgid "revision" +msgstr "リビジョン" + +msgid "delete a given bookmark" +msgstr "" + +msgid "rename a given bookmark" +msgstr "" + +msgid "hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]" +msgstr "" + +msgid "" +"Bugzilla integration\n" +"\n" +"This hook extension adds comments on bugs in Bugzilla when changesets\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n" +"status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla " +"installations\n" +"using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification " +"emails.\n" +"That script changes between Bugzilla versions; the 'processmail' script " +"used\n" +"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" +"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " +"user\n" +"pushing the change; you will need to ensure the Bugzilla install file\n" +"permissions are set appropriately.\n" +"\n" +"Configuring the extension:\n" +"\n" +" [bugzilla]\n" +" host Hostname of the MySQL server holding the Bugzilla database.\n" +" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +" user Username to use to access MySQL server. Default 'bugs'.\n" +" password Password to use to access MySQL server.\n" +" timeout Database connection timeout (seconds). Default 5.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 " +"and\n" +" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" +" versions prior to 2.18.\n" +" bzuser Fallback Bugzilla user name to record comments with, if\n" +" changeset committer cannot be found as a Bugzilla user.\n" +" bzdir Bugzilla install directory. Used by default notify.\n" +" Default '/var/www/html/bugzilla'.\n" +" notify The command to run to get Bugzilla to send bug change\n" +" notification emails. Substitutes from a map with 3 keys,\n" +" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla " +"email).\n" +" Default depends on version; from 2.18 it is\n" +" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" +"(user)s\".\n" +" regexp Regular expression to match bug IDs in changeset commit " +"message.\n" +" Must contain one \"()\" group. The default expression " +"matches\n" +" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" +" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " +"thereof.\n" +" Matching is case insensitive.\n" +" style The style file to use when formatting comments.\n" +" template Template to use when formatting comments. Overrides\n" +" style if specified. In addition to the usual Mercurial\n" +" keywords, the extension specifies:\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial " +"repository.\n" +" {webroot} Stripped pathname of the Mercurial " +"repository.\n" +" {hgweb} Base URL for browsing Mercurial " +"repositories.\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +" strip The number of slashes to strip from the front of {root}\n" +" to produce {webroot}. Default 0.\n" +" usermap Path of file containing Mercurial committer ID to Bugzilla " +"user\n" +" ID mappings. If specified, the file should contain one " +"mapping\n" +" per line, \"committer\"=\"Bugzilla user\". See also the\n" +" [usermap] section.\n" +"\n" +" [usermap]\n" +" Any entries in this section specify mappings of Mercurial committer ID\n" +" to Bugzilla user ID. See also [bugzilla].usermap.\n" +" \"committer\"=\"Bugzilla user\"\n" +"\n" +" [web]\n" +" baseurl Base URL for browsing Mercurial repositories. Reference from\n" +" templates as {hgweb}.\n" +"\n" +"Activating the extension:\n" +"\n" +" [extensions]\n" +" hgext.bugzilla =\n" +"\n" +" [hooks]\n" +" # run bugzilla hook on every change pulled or pushed in here\n" +" incoming.bugzilla = python:hgext.bugzilla.hook\n" +"\n" +"Example configuration:\n" +"\n" +"This example configuration is for a collection of Mercurial repositories\n" +"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" +"/opt/bugzilla-3.2.\n" +"\n" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" +"rev/{node|short}\\n\\n{desc}\\n\n" +" strip=5\n" +"\n" +" [web]\n" +" baseurl=http://dev.domain.com/hg\n" +"\n" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com\n" +"\n" +"Commits add a comment to the Bugzilla bug record of the form:\n" +"\n" +" Changeset 3b16791d6642 in repository-name.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" +"\n" +" Changeset commit comment. Bug 1234.\n" +msgstr "" + +msgid "support for bugzilla version 2.16." +msgstr "" + +#, python-format +msgid "connecting to %s:%s as %s, password %s\n" +msgstr "" + +msgid "run a query." +msgstr "" + +#, python-format +msgid "query: %s %s\n" +msgstr "" + +#, python-format +msgid "failed query: %s %s\n" +msgstr "" + +msgid "get identity of longdesc field" +msgstr "" + +msgid "unknown database schema" +msgstr "" + +msgid "filter not-existing bug ids from list." +msgstr "" + +msgid "filter bug ids from list that already refer to this changeset." +msgstr "" + +#, python-format +msgid "bug %d already knows about changeset %s\n" +msgstr "" + +msgid "tell bugzilla to send mail." +msgstr "" + +msgid "telling bugzilla to send mail:\n" +msgstr "" + +#, python-format +msgid " bug %s\n" +msgstr "" + +#, python-format +msgid "running notify command %s\n" +msgstr "" + +#, python-format +msgid "bugzilla notify command %s" +msgstr "" + +msgid "done\n" +msgstr "" + +msgid "look up numeric bugzilla user id." +msgstr "" + +#, python-format +msgid "looking up user %s\n" +msgstr "" + +msgid "map name of committer to bugzilla user name." +msgstr "" + +msgid "" +"see if committer is a registered bugzilla user. Return\n" +" bugzilla username and userid if so. If not, return default\n" +" bugzilla username and userid." +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s" +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s or %s" +msgstr "" + +msgid "" +"add comment to bug. try adding comment as committer of\n" +" changeset, otherwise as default bugzilla user." +msgstr "" + +msgid "support for bugzilla 2.18 series." +msgstr "" + +msgid "support for bugzilla 3.0 series." +msgstr "" + +msgid "" +"return object that knows how to talk to bugzilla version in\n" +" use." +msgstr "" + +#, python-format +msgid "bugzilla version %s not supported" +msgstr "" + +msgid "" +"find valid bug ids that are referred to in changeset\n" +" comments and that do not already have references to this\n" +" changeset." +msgstr "" + +msgid "update bugzilla bug with reference to changeset." +msgstr "" + +msgid "" +"strip leading prefix of repo root and turn into\n" +" url-safe path." +msgstr "" + +msgid "" +"changeset {node|short} in repo {root} refers to bug {bug}.\n" +"details:\n" +"\t{desc|tabindent}" +msgstr "" + +msgid "" +"add comment to bugzilla for each changeset that refers to a\n" +" bugzilla bug id. only add a comment once per bug, so same change\n" +" seen multiple times does not fill bug with duplicate data." +msgstr "" + +#, python-format +msgid "python mysql support not available: %s" +msgstr "" + +#, python-format +msgid "hook type %s does not pass a changeset id" +msgstr "" + +#, python-format +msgid "database error: %s" +msgstr "" + +msgid "" +"show the children of the given or working dir revision\n" +"\n" +" Print the children of the working directory's revisions.\n" +" If a revision is given via --rev, the children of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (after the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" + +msgid "show children of the specified rev" +msgstr "" + +msgid "hg children [-r REV] [FILE]" +msgstr "" + +msgid "command to show certain statistics about revision history" +msgstr "" + +msgid "Calculate stats" +msgstr "" + +#, python-format +msgid "Revision %d is a merge, ignoring...\n" +msgstr "" + +#, python-format +msgid "\rgenerating stats: %d%%" +msgstr "" + +msgid "" +"graph count of revisions grouped by template\n" +"\n" +" Will graph count of changed lines or revisions grouped by template or\n" +" alternatively by date, if dateformat is used. In this case it will " +"override\n" +" template.\n" +"\n" +" By default statistics are counted for number of changed lines.\n" +"\n" +" Examples:\n" +"\n" +" # display count of changed lines for every committer\n" +" hg churn -t '{author|email}'\n" +"\n" +" # display daily activity graph\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # display activity of developers by month\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # display count of lines changed in every year\n" +" hg churn -f '%Y' -s\n" +"\n" +" The map file format used to specify aliases is fairly simple:\n" +"\n" +" <alias email> <actual email>" +msgstr "" + +#, python-format +msgid "assuming %i character terminal\n" +msgstr "" + +msgid "count rate for the specified revision or range" +msgstr "" + +msgid "count rate for revs matching date spec" +msgstr "" + +msgid "template to group changesets" +msgstr "" + +msgid "strftime-compatible format for grouping by date" +msgstr "" + +msgid "count rate by number of changesets" +msgstr "" + +msgid "sort by key (default: sort by count)" +msgstr "" + +msgid "file with email aliases" +msgstr "" + +msgid "show progress" +msgstr "" + +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" +msgstr "" + +msgid "" +"add color output to status, qseries, and diff-related commands\n" +"\n" +"This extension modifies the status command to add color to its output to\n" +"reflect file status, the qseries command to add color to reflect patch " +"status\n" +"(applied, unapplied, missing), and to diff-related commands to highlight\n" +"additions, removals, diff headers, and trailing whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are also\n" +"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" +"ANSI escape codes). This module also provides the render_text function,\n" +"which can be used to add effects to any text.\n" +"\n" +"To enable this extension, add this to your .hgrc file:\n" +"[extensions]\n" +"color =\n" +"\n" +"Default effects my be overriden from the .hgrc file:\n" +"\n" +"[color]\n" +"status.modified = blue bold underline red_background\n" +"status.added = green bold\n" +"status.removed = red bold blue_background\n" +"status.deleted = cyan bold underline\n" +"status.unknown = magenta bold underline\n" +"status.ignored = black bold\n" +"\n" +"# 'none' turns off all effects\n" +"status.clean = none\n" +"status.copied = none\n" +"\n" +"qseries.applied = blue bold underline\n" +"qseries.unapplied = black bold\n" +"qseries.missing = red bold\n" +"\n" +"diff.diffline = bold\n" +"diff.extended = cyan bold\n" +"diff.file_a = red bold\n" +"diff.file_b = green bold\n" +"diff.hunk = magenta\n" +"diff.deleted = red\n" +"diff.inserted = green\n" +"diff.changed = white\n" +"diff.trailingwhitespace = bold red_background\n" +msgstr "" + +msgid "Wrap text in commands to turn on each effect." +msgstr "" + +msgid "run the status command with colored output" +msgstr "" + +msgid "run the qseries command with colored output" +msgstr "" + +msgid "wrap ui.write for colored diff output" +msgstr "" + +msgid "wrap cmdutil.changeset_printer.showpatch with colored output" +msgstr "" + +msgid "run the diff command with colored output" +msgstr "" + +msgid "Initialize the extension." +msgstr "" + +msgid "patch in command to command table and load effect map" +msgstr "" + +msgid "when to colorize (always, auto, or never)" +msgstr "" + +msgid "don't colorize output" +msgstr "" + +msgid "converting foreign VCS repositories to Mercurial" +msgstr "" + +msgid "" +"convert a foreign SCM repository to a Mercurial one.\n" +"\n" +" Accepted source formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - CVS [cvs]\n" +" - Darcs [darcs]\n" +" - git [git]\n" +" - Subversion [svn]\n" +" - Monotone [mtn]\n" +" - GNU Arch [gnuarch]\n" +" - Bazaar [bzr]\n" +"\n" +" Accepted destination formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - Subversion [svn] (history on branches is not preserved)\n" +"\n" +" If no revision is given, all revisions will be converted. Otherwise,\n" +" convert will only import up to the named revision (given in a format\n" +" understood by the source).\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source with '-hg' appended. If the destination\n" +" repository doesn't exist, it will be created.\n" +"\n" +" If <REVMAP> isn't given, it will be put in a default location\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" +" file that maps each source commit ID to the destination ID for\n" +" that revision, like so:\n" +" <source ID> <destination ID>\n" +"\n" +" If the file doesn't exist, it's automatically created. It's updated\n" +" on each commit copied, so convert-repo can be interrupted and can\n" +" be run repeatedly to copy new commits.\n" +"\n" +" The [username mapping] file is a simple text file that maps each source\n" +" commit author to a destination commit author. It is handy for source " +"SCMs\n" +" that use unix logins to identify authors (eg: CVS). One line per author\n" +" mapping and the line format is:\n" +" srcauthor=whatever string you want\n" +"\n" +" The filemap is a file that allows filtering and remapping of files\n" +" and directories. Comment lines start with '#'. Each line can\n" +" contain one of the following directives:\n" +"\n" +" include path/to/file\n" +"\n" +" exclude path/to/file\n" +"\n" +" rename from/file to/file\n" +"\n" +" The 'include' directive causes a file, or all files under a\n" +" directory, to be included in the destination repository, and the\n" +" exclusion of all other files and dirs not explicitely included.\n" +" The 'exclude' directive causes files or directories to be omitted.\n" +" The 'rename' directive renames a file or directory. To rename from a\n" +" subdirectory into the root of the repository, use '.' as the path to\n" +" rename to.\n" +"\n" +" The splicemap is a file that allows insertion of synthetic\n" +" history, letting you specify the parents of a revision. This is\n" +" useful if you want to e.g. give a Subversion merge two parents, or\n" +" graft two disconnected series of history together. Each entry\n" +" contains a key, followed by a space, followed by one or two\n" +" values, separated by spaces. The key is the revision ID in the\n" +" source revision control system whose parents should be modified\n" +" (same format as a key in .hg/shamap). The values are the revision\n" +" IDs (in either the source or destination revision control system)\n" +" that should be used as the new parents for that node.\n" +"\n" +" Mercurial Source\n" +" -----------------\n" +"\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" +" ignore integrity errors when reading. Use it to fix Mercurial\n" +" repositories with missing revlogs, by converting from and to\n" +" Mercurial.\n" +" --config convert.hg.saverev=True (boolean)\n" +" allow target to preserve source revision ID\n" +" --config convert.hg.startrev=0 (hg revision identifier)\n" +" convert start revision and its descendants\n" +"\n" +" CVS Source\n" +" ----------\n" +"\n" +" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" +" to indicate the starting point of what will be converted. Direct\n" +" access to the repository files is not needed, unless of course\n" +" the repository is :local:. The conversion uses the top level\n" +" directory in the sandbox to find the CVS repository, and then uses\n" +" CVS rlog commands to find files to convert. This means that unless\n" +" a filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganisation in the CVS\n" +" sandbox is ignored.\n" +"\n" +" Because CVS does not have changesets, it is necessary to collect\n" +" individual commits to CVS and merge them into changesets. CVS\n" +" source uses its internal changeset merging code by default but can\n" +" be configured to call the external 'cvsps' program by setting:\n" +" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +" This is a legacy option and may be removed in future.\n" +"\n" +" The options shown are the defaults.\n" +"\n" +" Internal cvsps is selected by setting\n" +" --config convert.cvsps=builtin\n" +" and has a few more configurable options:\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed between\n" +" commits with identical user and log message in a single\n" +" changeset. When very large files were checked in as part\n" +" of a changeset then the default may not be long enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" insert a dummy revision merging the branch on which this log\n" +" message occurs to the branch indicated in the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" add the most recent revision on the branch indicated in the\n" +" regex as the second parent of the changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" +" merging code to be run without doing a conversion. Its parameters and\n" +" output are similar to that of cvsps 2.1.\n" +"\n" +" Subversion Source\n" +" -----------------\n" +"\n" +" Subversion source detects classical trunk/branches/tags layouts.\n" +" By default, the supplied \"svn://repo/path/\" source URL is\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists\n" +" it replaces the default branch. If \"svn://repo/path/branches\"\n" +" exists, its subdirectories are listed as possible branches. If\n" +" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" +" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" +" can be overriden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable\n" +" autodetection.\n" +"\n" +" --config convert.svn.branches=branches (directory name)\n" +" specify the directory containing branches\n" +" --config convert.svn.tags=tags (directory name)\n" +" specify the directory containing tags\n" +" --config convert.svn.trunk=trunk (directory name)\n" +" specify the name of the trunk branch\n" +"\n" +" Source history can be retrieved starting at a specific revision,\n" +" instead of being integrally converted. Only single branch\n" +" conversions are supported.\n" +"\n" +" --config convert.svn.startrev=0 (svn revision number)\n" +" specify start Subversion revision.\n" +"\n" +" Mercurial Destination\n" +" ---------------------\n" +"\n" +" --config convert.hg.clonebranches=False (boolean)\n" +" dispatch source branches in separate clones.\n" +" --config convert.hg.tagsbranch=default (branch name)\n" +" tag revisions branch name\n" +" --config convert.hg.usebranchnames=True (boolean)\n" +" preserve branch names\n" +"\n" +" " +msgstr "" + +msgid "" +"create changeset information from CVS\n" +"\n" +" This command is intended as a debugging tool for the CVS to Mercurial\n" +" converter, and can be used as a direct replacement for cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" +" directory) in the CVS repository, and converts the log to a series of\n" +" changesets based on matching commit log entries and dates." +msgstr "" + +msgid "username mapping filename" +msgstr "" + +msgid "destination repository type" +msgstr "" + +msgid "remap file names using contents of file" +msgstr "" + +msgid "import up to target revision REV" +msgstr "" + +msgid "source repository type" +msgstr "" + +msgid "splice synthesized history into place" +msgstr "" + +msgid "try to sort changesets by date" +msgstr "" + +msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" +msgstr "" + +msgid "only return changes on specified branches" +msgstr "" + +msgid "prefix to remove from file names" +msgstr "" + +msgid "only return changes after or between specified tags" +msgstr "" + +msgid "update cvs log cache" +msgstr "" + +msgid "create new cvs log cache" +msgstr "" + +msgid "set commit time fuzz in seconds" +msgstr "" + +msgid "specify cvsroot" +msgstr "" + +msgid "show parent changesets" +msgstr "" + +msgid "show current changeset in ancestor branches" +msgstr "" + +msgid "ignored for compatibility" +msgstr "" + +msgid "hg debugcvsps [OPTION]... [PATH]..." +msgstr "" + +#, python-format +msgid "%s is not a valid revision in current branch" +msgstr "" + +#, python-format +msgid "%s is not available in %s anymore" +msgstr "" + +#, python-format +msgid "cannot find required \"%s\" tool" +msgstr "" + +#, python-format +msgid "running: %s\n" +msgstr "" + +#, python-format +msgid "%s error:\n" +msgstr "" + +#, python-format +msgid "%s %s" +msgstr "" + +#, python-format +msgid "could not open map file %r: %s" +msgstr "" + +#, python-format +msgid "%s: missing or unsupported repository" +msgstr "" + +#, python-format +msgid "convert: %s\n" +msgstr "" + +#, python-format +msgid "%s: unknown repository type" +msgstr "" + +#, python-format +msgid "cycle detected between %s and %s" +msgstr "" + +msgid "not all revisions were sorted" +msgstr "" + +#, python-format +msgid "Writing author map file %s\n" +msgstr "" + +#, python-format +msgid "Overriding mapping for author %s, was %s, will be %s\n" +msgstr "" + +#, python-format +msgid "mapping author %s to %s\n" +msgstr "" + +#, python-format +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "" + +#, python-format +msgid "spliced in %s as parents of %s\n" +msgstr "" + +msgid "scanning source...\n" +msgstr "" + +msgid "sorting...\n" +msgstr "" + +msgid "converting...\n" +msgstr "" + +#, python-format +msgid "source: %s\n" +msgstr "" + +#, python-format +msgid "assuming destination %s\n" +msgstr "" + +#, python-format +msgid "revision %s is not a patchset number or date" +msgstr "" + +msgid "using builtin cvsps\n" +msgstr "" + +#, python-format +msgid "connecting to %s\n" +msgstr "" + +msgid "CVS pserver authentication failed" +msgstr "" + +msgid "server sucks" +msgstr "" + +#, python-format +msgid "%d bytes missing from remote file" +msgstr "" + +#, python-format +msgid "cvs server: %s\n" +msgstr "" + +#, python-format +msgid "unknown CVS response: %s" +msgstr "" + +msgid "collecting CVS rlog\n" +msgstr "" + +#, python-format +msgid "reading cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "cache has %d log entries\n" +msgstr "" + +#, python-format +msgid "error reading cache: %r\n" +msgstr "" + +#, python-format +msgid "running %s\n" +msgstr "" + +#, python-format +msgid "prefix=%r directory=%r root=%r\n" +msgstr "" + +msgid "RCS file must be followed by working file" +msgstr "" + +msgid "must have at least some revisions" +msgstr "" + +msgid "expected revision number" +msgstr "" + +msgid "revision must be followed by date line" +msgstr "" + +#, python-format +msgid "writing cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "%d log entries\n" +msgstr "" + +msgid "creating changesets\n" +msgstr "" + +#, python-format +msgid "%d changeset entries\n" +msgstr "" + +msgid "Python ElementTree module is not available" +msgstr "" + +#, python-format +msgid "cleaning up %s\n" +msgstr "" + +msgid "internal calling inconsistency" +msgstr "" + +msgid "errors in filemap" +msgstr "" + +#, python-format +msgid "%s:%d: %r already in %s list\n" +msgstr "" + +#, python-format +msgid "%s:%d: unknown directive %r\n" +msgstr "" + +msgid "source repository doesn't support --filemap" +msgstr "" + +#, python-format +msgid "%s does not look like a GNU Arch repo" +msgstr "" + +msgid "cannot find a GNU Arch tool" +msgstr "" + +#, python-format +msgid "analyzing tree version %s...\n" +msgstr "" + +#, python-format +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "" + +#, python-format +msgid "applying revision %s...\n" +msgstr "" + +#, python-format +msgid "computing changeset between %s and %s...\n" +msgstr "" + +#, python-format +msgid "obtaining revision %s...\n" +msgstr "" + +#, python-format +msgid "analysing revision %s...\n" +msgstr "" + +#, python-format +msgid "could not parse cat-log of %s" +msgstr "" + +#, python-format +msgid "%s is not a local Mercurial repo" +msgstr "" + +#, python-format +msgid "initializing destination %s repository\n" +msgstr "" + +msgid "run hg sink pre-conversion action\n" +msgstr "" + +msgid "run hg sink post-conversion action\n" +msgstr "" + +#, python-format +msgid "pulling from %s into %s\n" +msgstr "" + +msgid "updating tags\n" +msgstr "" + +#, python-format +msgid "%s is not a valid start revision" +msgstr "" + +#, python-format +msgid "ignoring: %s\n" +msgstr "" + +msgid "run hg source pre-conversion action\n" +msgstr "" + +msgid "run hg source post-conversion action\n" +msgstr "" + +#, python-format +msgid "%s does not look like a monotone repo" +msgstr "" + +#, python-format +msgid "copying file in renamed dir from '%s' to '%s'" +msgstr "" + +msgid "Subversion python bindings could not be loaded" +msgstr "" + +#, python-format +msgid "Subversion python bindings %d.%d found, 1.4 or later required" +msgstr "" + +msgid "Subversion python bindings are too old, 1.4 or later required" +msgstr "" + +#, python-format +msgid "svn: revision %s is not an integer" +msgstr "" + +#, python-format +msgid "svn: start revision %s is not an integer" +msgstr "" + +#, python-format +msgid "no revision found in module %s" +msgstr "" + +#, python-format +msgid "expected %s to be at %r, but not found" +msgstr "" + +#, python-format +msgid "found %s at %r\n" +msgstr "" + +#, python-format +msgid "ignoring empty branch %s\n" +msgstr "" + +#, python-format +msgid "found branch %s at %d\n" +msgstr "" + +msgid "svn: start revision is not supported with with more than one branch" +msgstr "" + +#, python-format +msgid "svn: no revision found after start revision %d" +msgstr "" + +#, python-format +msgid "no tags found at revision %d\n" +msgstr "" + +#, python-format +msgid "ignoring foreign branch %r\n" +msgstr "" + +#, python-format +msgid "%s not found up to revision %d" +msgstr "" + +#, python-format +msgid "branch renamed from %s to %s at %d\n" +msgstr "" + +#, python-format +msgid "reparent to %s\n" +msgstr "" + +#, python-format +msgid "copied to %s from %s@%s\n" +msgstr "" + +#, python-format +msgid "gone from %s\n" +msgstr "" + +#, python-format +msgid "found parent directory %s\n" +msgstr "" + +#, python-format +msgid "base, entry %s %s\n" +msgstr "" + +msgid "munge-o-matic\n" +msgstr "" + +#, python-format +msgid "info: %s %s %s %s\n" +msgstr "" + +#, python-format +msgid "unknown path in revision %d: %s\n" +msgstr "" + +#, python-format +msgid "mark %s came from %s:%d\n" +msgstr "" + +#, python-format +msgid "parsing revision %d (%d changes)\n" +msgstr "" + +#, python-format +msgid "found parent of branch %s at %d: %s\n" +msgstr "" + +msgid "no copyfrom path, don't know what to do.\n" +msgstr "" + +#, python-format +msgid "fetching revision log for \"%s\" from %d to %d\n" +msgstr "" + +#, python-format +msgid "skipping blacklisted revision %d\n" +msgstr "" + +#, python-format +msgid "revision %d has no entries\n" +msgstr "" + +#, python-format +msgid "svn: branch has no revision %s" +msgstr "" + +#, python-format +msgid "%r is not under %r, ignoring\n" +msgstr "" + +#, python-format +msgid "initializing svn repo %r\n" +msgstr "" + +#, python-format +msgid "initializing svn wc %r\n" +msgstr "" + +msgid "unexpected svn output:\n" +msgstr "" + +msgid "unable to cope with svn output" +msgstr "" + +msgid "XXX TAGS NOT IMPLEMENTED YET\n" +msgstr "" + +msgid "" +"\n" +"The `extdiff' Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working dir. The external diff\n" +"programs are called with a configurable set of options and two\n" +"non-option arguments: paths to directories containing snapshots of\n" +"files to compare.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.extdiff =\n" +"\n" +"The `extdiff' extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"\n" +" [extdiff]\n" +" # add new command that runs GNU diff(1) in 'context diff' mode\n" +" cdiff = gdiff -Nprc5\n" +" ## or the old way:\n" +" #cmd.cdiff = gdiff\n" +" #opts.cdiff = -Nprc5\n" +"\n" +" # add new command called vdiff, runs kdiff3\n" +" vdiff = kdiff3\n" +"\n" +" # add new command called meld, runs meld (no need to name twice)\n" +" meld =\n" +"\n" +" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" +" #(see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " +"in\n" +" # your .vimrc\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" +"\n" +"You can use -I/-X and list of file or directory names like normal\n" +"\"hg diff\" command. The `extdiff' extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" +msgstr "" + +msgid "snapshot files as of some revision" +msgstr "" + +#, python-format +msgid "making snapshot of %d files from rev %s\n" +msgstr "" + +msgid "" +"snapshot files from working directory.\n" +" if not using snapshot, -I/-X does not work and recursive diff\n" +" in tools like kdiff3 and meld displays too many files." +msgstr "" + +#, python-format +msgid "making snapshot of %d files from working dir\n" +msgstr "" + +msgid "" +"Do the actuall diff:\n" +"\n" +" - copy to a temp structure if diffing 2 internal revisions\n" +" - copy to a temp structure if diffing working revision with\n" +" another one and more than 1 file is changed\n" +" - just invoke the diff for a single file in the working dir\n" +" " +msgstr "" + +msgid "cannot specify --rev and --change at the same time" +msgstr "" + +#, python-format +msgid "running %r in %s\n" +msgstr "" + +#, python-format +msgid "file changed while diffing. Overwriting: %s (src: %s)\n" +msgstr "" + +msgid "cleaning up temp directory\n" +msgstr "" + +msgid "" +"use external program to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using\n" +" an external program. The default program used is diff, with\n" +" default options \"-Npru\".\n" +"\n" +" To select a different program, use the -p option. The program\n" +" will be passed the names of two directories to compare. To pass\n" +" additional options to the program, use the -o option. These will\n" +" be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are\n" +" shown between those revisions. If only one revision is\n" +" specified then that revision is compared to the working\n" +" directory, and, when no revisions are specified, the\n" +" working directory files are compared to its parent." +msgstr "" + +msgid "comparison program to run" +msgstr "" + +msgid "pass option to comparison program" +msgstr "" + +msgid "change made by revision" +msgstr "" + +msgid "hg extdiff [OPT]... [FILE]..." +msgstr "" + +msgid "use closure to save diff command to use" +msgstr "" + +#, python-format +msgid "hg %s [OPTION]... [FILE]..." +msgstr "" + +msgid "pulling, updating and merging in one command" +msgstr "" + +msgid "" +"pull changes from a remote repository, merge new changes if needed.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository.\n" +"\n" +" If the pulled changes add a new branch head, the head is automatically\n" +" merged, and the result of the merge is committed. Otherwise, the\n" +" working directory is updated to include the new changes.\n" +"\n" +" When a merge occurs, the newly pulled changes are assumed to be\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" +" order, use --switch-parent.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" + +msgid "outstanding uncommitted merge" +msgstr "" + +msgid "outstanding uncommitted changes" +msgstr "" + +msgid "working directory is missing some files" +msgstr "" + +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" + +#, python-format +msgid "pulling from %s\n" +msgstr "%s から取り込み中\n" + +msgid "fetch -r doesn't work for remote repositories yet" +msgstr "" + +#, python-format +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" +msgstr "" + +#, python-format +msgid "updating to %d:%s\n" +msgstr "" + +#, python-format +msgid "merging with %d:%s\n" +msgstr "" + +#, python-format +msgid "Automated merge with %s" +msgstr "" + +#, python-format +msgid "new changeset %d:%s merges remote changes with local\n" +msgstr "" + +msgid "a specific revision you would like to pull" +msgstr "" + +msgid "edit commit message" +msgstr "" + +msgid "edit commit message (DEPRECATED)" +msgstr "" + +msgid "switch parents when merging" +msgstr "" + +msgid "hg fetch [SOURCE]" +msgstr "" + +msgid " returns of the good and bad signatures" +msgstr "" + +msgid "error while verifying signature" +msgstr "" + +msgid "create a new gpg instance" +msgstr "" + +msgid "" +"\n" +" walk over every sigs, yields a couple\n" +" ((node, version, sig), (filename, linenumber))\n" +" " +msgstr "" + +msgid "get the keys who signed a data" +msgstr "" + +#, python-format +msgid "%s Bad signature from \"%s\"\n" +msgstr "" + +#, python-format +msgid "%s Note: Signature has expired (signed by: \"%s\")\n" +msgstr "" + +#, python-format +msgid "%s Note: This key has expired (signed by: \"%s\")\n" +msgstr "" + +msgid "list signed changesets" +msgstr "" + +#, python-format +msgid "%s:%d node does not exist\n" +msgstr "" + +msgid "verify all the signatures there may be for a particular revision" +msgstr "" + +#, python-format +msgid "No valid signature for %s\n" +msgstr "" + +msgid "associate a string to a key (username, comment)" +msgstr "" + +msgid "" +"add a signature for the current or given revision\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "uncommitted merge - please provide a specific revision" +msgstr "マージが未コミットです - リビジョンを指定してください" + +msgid "Error while signing" +msgstr "" + +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" + +#, python-format +msgid "Added signature for changeset %s" +msgstr "" + +msgid "map a manifest into some text" +msgstr "" + +msgid "unknown signature version" +msgstr "" + +msgid "make the signature local" +msgstr "" + +msgid "sign even if the sigfile is modified" +msgstr "" + +msgid "do not commit the sigfile after signing" +msgstr "" + +msgid "the key id to sign with" +msgstr "" + +msgid "commit message" +msgstr "" + +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "" + +msgid "hg sigcheck REVISION" +msgstr "" + +msgid "hg sigs" +msgstr "" + +msgid "" +"show revision graphs in terminal windows\n" +"\n" +"This extension adds a --graph option to the incoming, outgoing and log\n" +"commands. When this options is given, an ascii representation of the\n" +"revision graph is also shown.\n" +msgstr "" + +msgid "" +"cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history from " +"revision\n" +" start to revision stop (which must be less than or equal to start).\n" +" " +msgstr "" + +msgid "" +"file cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history of a single\n" +" file from revision start to revision stop (which must be less than or\n" +" equal to start).\n" +" " +msgstr "" + +msgid "" +"grapher for asciigraph on a list of nodes and their parents\n" +"\n" +" nodes must generate tuples (node, parents, char, lines) where\n" +" - parents must generate the parents of node, in sorted order,\n" +" and max length 2,\n" +" - char is the char to print as the node symbol, and\n" +" - lines are the lines to display next to the node.\n" +" " +msgstr "" + +msgid "" +"prints an ASCII graph of the DAG returned by the grapher\n" +"\n" +" grapher is a generator that emits tuples with the following elements:\n" +"\n" +" - Character to use as node's symbol.\n" +" - List of lines to display as the node's text.\n" +" - Column of the current node in the set of ongoing edges.\n" +" - Edges; a list of (col, next_col) indicating the edges between\n" +" the current node and its parents.\n" +" - Number of columns (ongoing edges) in the current revision.\n" +" - The difference between the number of columns (ongoing edges)\n" +" in the next revision and the number of columns (ongoing edges)\n" +" in the current revision. That is: -1 means one column removed;\n" +" 0 means no columns added or removed; 1 means one column added.\n" +" " +msgstr "" + +#, python-format +msgid "--graph option is incompatible with --%s" +msgstr "" + +msgid "" +"show revision history alongside an ASCII revision graph\n" +"\n" +" Print a revision history alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "" +"show the outgoing changesets alongside an ASCII revision graph\n" +"\n" +" Print the outgoing changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +#, python-format +msgid "comparing with %s\n" +msgstr "%s と比較中\n" + +msgid "no changes found\n" +msgstr "新たなチェンジセットはありません\n" + +msgid "" +"show the incoming changesets alongside an ASCII revision graph\n" +"\n" +" Print the incoming changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "wrap the command" +msgstr "" + +msgid "show the revision DAG" +msgstr "" + +msgid "limit number of changes displayed" +msgstr "チェンジセット表示数の制限" + +msgid "show patch" +msgstr "パッチ形式での表示" + +msgid "show the specified revision or range" +msgstr "指定された単一ないし範囲内のリビジョンの表示" + +msgid "hg glog [OPTION]... [FILE]" +msgstr "" + +msgid "" +"CIA notification\n" +"\n" +"This is meant to be run as a changegroup or incoming hook.\n" +"To configure it, set the following options in your hgrc:\n" +"\n" +"[cia]\n" +"# your registered CIA user name\n" +"user = foo\n" +"# the name of the project in CIA\n" +"project = foo\n" +"# the module (subproject) (optional)\n" +"#module = foo\n" +"# Append a diffstat to the log message (optional)\n" +"#diffstat = False\n" +"# Template to use for log messages (optional)\n" +"#template = {desc}\n" +"{baseurl}/rev/{node}-- {diffstat}\n" +"# Style to use (optional)\n" +"#style = foo\n" +"# The URL of the CIA notification service (optional)\n" +"# You can use mailto: URLs to send by email, eg\n" +"# mailto:cia@cia.vc\n" +"# Make sure to set email.from if you do this.\n" +"#url = http://cia.vc/\n" +"# print message instead of sending it (optional)\n" +"#test = False\n" +"\n" +"[hooks]\n" +"# one of these:\n" +"changegroup.cia = python:hgcia.hook\n" +"#incoming.cia = python:hgcia.hook\n" +"\n" +"[web]\n" +"# If you want hyperlinks (optional)\n" +"baseurl = http://server/path/to/repo\n" +msgstr "" + +msgid " A CIA message " +msgstr "" + +msgid " CIA notification class " +msgstr "" + +#, python-format +msgid "hgcia: sending update to %s\n" +msgstr "" + +msgid " send CIA notification " +msgstr "" + +msgid "email.from must be defined when sending by email" +msgstr "" + +msgid "cia: no user specified" +msgstr "" + +msgid "cia: no project specified" +msgstr "" + +msgid "" +"browsing the repository in a graphical way\n" +"\n" +"The hgk extension allows browsing the history of a repository in a\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" +"not distributed with Mercurial.)\n" +"\n" +"hgk consists of two parts: a Tcl script that does the displaying and\n" +"querying of information, and an extension to mercurial named hgk.py,\n" +"which provides hooks for hgk to get information. hgk can be found in\n" +"the contrib directory, and hgk.py can be found in the hgext directory.\n" +"\n" +"To load the hgext.py extension, add it to your .hgrc file (you have\n" +"to use your global $HOME/.hgrc file, not one in a repository). You\n" +"can specify an absolute path:\n" +"\n" +" [extensions]\n" +" hgk=/usr/local/lib/hgk.py\n" +"\n" +"Mercurial can also scan the default python library path for a file\n" +"named 'hgk.py' if you set hgk empty:\n" +"\n" +" [extensions]\n" +" hgk=\n" +"\n" +"The hg view command will launch the hgk Tcl script. For this command\n" +"to work, hgk must be in your search path. Alternately, you can\n" +"specify the path to hgk in your .hgrc file:\n" +"\n" +" [hgk]\n" +" path=/location/of/hgk\n" +"\n" +"hgk can make use of the extdiff extension to visualize revisions.\n" +"Assuming you had already configured extdiff vdiff command, just add:\n" +"\n" +" [hgk]\n" +" vdiff=vdiff\n" +"\n" +"Revisions context menu will now display additional entries to fire\n" +"vdiff on hovered and selected revisions." +msgstr "" + +msgid "diff trees from two commits" +msgstr "" + +msgid "output common ancestor information" +msgstr "" + +msgid "cat a specific revision" +msgstr "" + +msgid "cat-file: type or revision not supplied\n" +msgstr "" + +msgid "aborting hg cat-file only understands commits\n" +msgstr "" + +msgid "parse given revisions" +msgstr "" + +msgid "print revisions" +msgstr "" + +msgid "print extension options" +msgstr "" + +msgid "start interactive history viewer" +msgstr "" + +msgid "hg view [-l LIMIT] [REVRANGE]" +msgstr "" + +msgid "generate patch" +msgstr "" + +msgid "recursive" +msgstr "" + +msgid "pretty" +msgstr "" + +msgid "stdin" +msgstr "" + +msgid "detect copies" +msgstr "" + +msgid "search" +msgstr "" + +msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." +msgstr "" + +msgid "hg debug-cat-file [OPTION]... TYPE FILE" +msgstr "" + +msgid "hg debug-config" +msgstr "" + +msgid "hg debug-merge-base node node" +msgstr "" + +msgid "ignored" +msgstr "" + +msgid "hg debug-rev-parse REV" +msgstr "" + +msgid "header" +msgstr "" + +msgid "topo-order" +msgstr "" + +msgid "parents" +msgstr "" + +msgid "max-count" +msgstr "" + +msgid "hg debug-rev-list [options] revs" +msgstr "" + +msgid "" +"syntax highlighting in hgweb, based on Pygments\n" +"\n" +"It depends on the pygments syntax highlighting library:\n" +"http://pygments.org/\n" +"\n" +"To enable the extension add this to hgrc:\n" +"\n" +"[extensions]\n" +"hgext.highlight =\n" +"\n" +"There is a single configuration option:\n" +"\n" +"[web]\n" +"pygments_style = <style>\n" +"\n" +"The default is 'colorful'.\n" +"\n" +"-- Adam Hupp <adam@hupp.org>\n" +msgstr "" + +msgid "inotify-based status acceleration for Linux systems\n" +msgstr "" + +msgid "start an inotify server for this repository" +msgstr "" + +msgid "(found dead inotify server socket; removing it)\n" +msgstr "" + +msgid "(starting inotify server)\n" +msgstr "" + +#, python-format +msgid "could not start inotify server: %s\n" +msgstr "" + +#, python-format +msgid "could not talk to new inotify server: %s\n" +msgstr "" + +msgid "(inotify server not running)\n" +msgstr "" + +#, python-format +msgid "failed to contact inotify server: %s\n" +msgstr "" + +msgid "run server in background" +msgstr "バックグラウンドでのサーバ実行" + +msgid "used internally by daemon mode" +msgstr "バックグラウンド実行時での内部用途向け" + +msgid "minutes to sit idle before exiting" +msgstr "" + +msgid "name of file to write process ID to" +msgstr "プロセスID書き出し先ファイル名" + +msgid "hg inserve [OPT]..." +msgstr "" + +#, python-format +msgid "(inotify: received response from incompatible server version %d)\n" +msgstr "" + +msgid "this system does not seem to support inotify" +msgstr "" + +#, python-format +msgid "*** the current per-user limit on the number of inotify watches is %s\n" +msgstr "" + +msgid "*** this limit is too low to watch every directory in this repository\n" +msgstr "" + +msgid "*** counting directories: " +msgstr "" + +#, python-format +msgid "found %d\n" +msgstr "" + +#, python-format +msgid "*** to raise the limit from %d to %d (run as root):\n" +msgstr "" + +#, python-format +msgid "*** echo %d > %s\n" +msgstr "" + +#, python-format +msgid "cannot watch %s until inotify watch limit is raised" +msgstr "" + +#, python-format +msgid "inotify service not available: %s" +msgstr "" + +#, python-format +msgid "watching %r\n" +msgstr "" + +#, python-format +msgid "watching directories under %r\n" +msgstr "" + +#, python-format +msgid "status: %r dir(%d) -> %s\n" +msgstr "" + +#, python-format +msgid "status: %r %s -> %s\n" +msgstr "" + +#, python-format +msgid "%s dirstate reload\n" +msgstr "" + +#, python-format +msgid "%s end dirstate reload\n" +msgstr "" + +msgid "rescanning due to .hgignore change\n" +msgstr "" + +#, python-format +msgid "%s event: created %s\n" +msgstr "" + +#, python-format +msgid "%s event: deleted %s\n" +msgstr "" + +#, python-format +msgid "%s event: modified %s\n" +msgstr "" + +#, python-format +msgid "filesystem containing %s was unmounted\n" +msgstr "" + +#, python-format +msgid "%s readable: %d bytes\n" +msgstr "" + +#, python-format +msgid "%s below threshold - unhooking\n" +msgstr "" + +#, python-format +msgid "%s reading %d events\n" +msgstr "" + +#, python-format +msgid "%s hooking back up with %d bytes readable\n" +msgstr "" + +#, python-format +msgid "%s processing %d deferred events as %d\n" +msgstr "" + +#, python-format +msgid "could not start server: %s" +msgstr "" + +#, python-format +msgid "received query from incompatible client version %d\n" +msgstr "" + +#, python-format +msgid "answering query for %r\n" +msgstr "" + +msgid "finished setup\n" +msgstr "" + +msgid "polling: no timeout\n" +msgstr "" + +#, python-format +msgid "polling: %sms timeout\n" +msgstr "" + +#, python-format +msgid "interhg: invalid pattern for %s: %s\n" +msgstr "" + +#, python-format +msgid "interhg: invalid regexp for %s: %s\n" +msgstr "" + +msgid "" +"keyword expansion in local repositories\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$\n" +"in tracked text files selected by your configuration.\n" +"\n" +"Keywords are only expanded in local repositories and not stored in\n" +"the change history. The mechanism can be regarded as a convenience\n" +"for the current user or for archive distribution.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections\n" +"of hgrc files.\n" +"\n" +"Example:\n" +"\n" +" [keyword]\n" +" # expand keywords in every python file except those matching \"x*\"\n" +" **.py =\n" +" x* = ignore\n" +"\n" +"Note: the more specific you are in your filename patterns\n" +" the less you lose speed in huge repos.\n" +"\n" +"For [keywordmaps] template mapping and expansion demonstration and\n" +"control run \"hg kwdemo\".\n" +"\n" +"An additional date template filter {date|utcdate} is provided.\n" +"\n" +"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" +"with customized keywords and templates.\n" +"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"\n" +"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +"the risk of inadvertedly storing expanded keywords in the change history.\n" +"\n" +"To force expansion after enabling it, or a configuration change, run\n" +"\"hg kwexpand\".\n" +"\n" +"Also, when committing with the record extension or using mq's qrecord, be " +"aware\n" +"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" +"question to update keyword expansions after all changes have been checked " +"in.\n" +"\n" +"Expansions spanning more than one line and incremental expansions,\n" +"like CVS' $Log$, are not supported. A keyword template map\n" +"\"Log = {desc}\" expands to the first line of the changeset description.\n" +msgstr "" + +msgid "Returns hgdate in cvs-like UTC format." +msgstr "" + +msgid "" +"\n" +" Sets up keyword templates, corresponding keyword regex, and\n" +" provides keyword substitution functions.\n" +" " +msgstr "" + +msgid "Replaces keywords in data with expanded template." +msgstr "" + +msgid "Returns data with keywords expanded." +msgstr "" + +msgid "" +"Returns true if path matches [keyword] pattern\n" +" and is not a symbolic link.\n" +" Caveat: localrepository._link fails on Windows." +msgstr "" + +msgid "Overwrites selected files expanding/shrinking keywords." +msgstr "" + +#, python-format +msgid "overwriting %s %s keywords\n" +msgstr "" + +msgid "Unconditionally removes all keyword substitutions from text." +msgstr "" + +msgid "Returns text with all keyword substitutions removed." +msgstr "" + +msgid "Returns lines with keyword substitutions removed." +msgstr "" + +msgid "" +"If in restricted mode returns data read from wdir with\n" +" keyword substitutions removed." +msgstr "" + +msgid "" +"\n" +" Subclass of filelog to hook into its read, add, cmp methods.\n" +" Keywords are \"stored\" unexpanded, and processed on reading.\n" +" " +msgstr "" + +msgid "Expands keywords when reading filelog." +msgstr "" + +msgid "Removes keyword substitutions when adding to filelog." +msgstr "" + +msgid "Removes keyword substitutions for comparison." +msgstr "" + +msgid "" +"Bails out if [keyword] configuration is not active.\n" +" Returns status of working directory." +msgstr "" + +msgid "[keyword] patterns cannot match" +msgstr "" + +msgid "no [keyword] patterns configured" +msgstr "" + +msgid "Selects files and passes them to kwtemplater.overwrite." +msgstr "" + +msgid "" +"print [keywordmaps] configuration and an expansion example\n" +"\n" +" Show current, custom, or default keyword template maps\n" +" and their expansion.\n" +"\n" +" Extend current configuration by specifying maps as arguments\n" +" and optionally by reading from an additional hgrc file.\n" +"\n" +" Override current keyword template maps with \"default\" option.\n" +" " +msgstr "" + +#, python-format +msgid "" +"\n" +"\t%s\n" +msgstr "" + +#, python-format +msgid "creating temporary repo at %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"%s keywords written to %s:\n" +msgstr "" + +msgid "unhooked all commit hooks\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"removing temporary repo %s\n" +msgstr "" + +msgid "" +"expand keywords in working directory\n" +"\n" +" Run after (re)enabling keyword expansion.\n" +"\n" +" kwexpand refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"print files currently configured for keyword expansion\n" +"\n" +" Crosscheck which files in working directory are potential targets for\n" +" keyword expansion.\n" +" That is, files matched by [keyword] config patterns but not symlinks.\n" +" " +msgstr "" + +msgid "" +"revert expanded keywords in working directory\n" +"\n" +" Run before changing/disabling active keywords\n" +" or if you experience problems with \"hg import\" or \"hg merge\".\n" +"\n" +" kwshrink refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"Collects [keyword] config in kwtools.\n" +" Monkeypatches dispatch._parse if needed." +msgstr "" + +msgid "Monkeypatch dispatch._parse to obtain running hg command." +msgstr "" + +msgid "" +"Sets up repo as kwrepo for keyword substitution.\n" +" Overrides file method to return kwfilelog instead of filelog\n" +" if file matches user configuration.\n" +" Wraps commit to overwrite configured files with updated\n" +" keyword substitutions.\n" +" Monkeypatches patch and webcommands." +msgstr "" + +msgid "" +"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" +" rejects or conflicts due to expanded keywords in working dir." +msgstr "" + +msgid "" +"Monkeypatch patch.diff to avoid expansion except when\n" +" comparing against working dir." +msgstr "" + +msgid "Wraps webcommands.x turning off keyword expansion." +msgstr "" + +msgid "show default keyword template maps" +msgstr "" + +msgid "read maps from rcfile" +msgstr "" + +msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." +msgstr "" + +msgid "hg kwexpand [OPTION]... [FILE]..." +msgstr "" + +msgid "show keyword status flags of all files" +msgstr "" + +msgid "show files excluded from expansion" +msgstr "" + +msgid "additionally show untracked files" +msgstr "" + +msgid "hg kwfiles [OPTION]... [FILE]..." +msgstr "" + +msgid "hg kwshrink [OPTION]... [FILE]..." +msgstr "" + +msgid "" +"patch management and development\n" +"\n" +"This extension lets you work with a stack of patches in a Mercurial\n" +"repository. It manages two stacks of patches - all known patches, and\n" +"applied patches (subset of known patches).\n" +"\n" +"Known patches are represented as patch files in the .hg/patches\n" +"directory. Applied patches are both patch files and changesets.\n" +"\n" +"Common tasks (use \"hg help command\" for more details):\n" +"\n" +"prepare repository to work with patches qinit\n" +"create new patch qnew\n" +"import existing patch qimport\n" +"\n" +"print patch series qseries\n" +"print applied patches qapplied\n" +"print name of top applied patch qtop\n" +"\n" +"add known patch to applied stack qpush\n" +"remove patch from applied stack qpop\n" +"refresh contents of top applied patch qrefresh\n" +msgstr "" + +msgid "" +"Update all references to a field in the patch header.\n" +" If none found, add it email style." +msgstr "" + +msgid "" +"Remove existing message, keeping the rest of the comments fields.\n" +" If comments contains 'subject: ', message will prepend\n" +" the field and a blank line." +msgstr "" + +#, python-format +msgid "%s appears more than once in %s" +msgstr "" + +msgid "guard cannot be an empty string" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid character: %r" +msgstr "" + +#, python-format +msgid "invalid character in guard %r: %r" +msgstr "" + +#, python-format +msgid "active guards: %s\n" +msgstr "" + +#, python-format +msgid "guard %r too short" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid char" +msgstr "" + +#, python-format +msgid "allowing %s - no guards in effect\n" +msgstr "" + +#, python-format +msgid "allowing %s - no matching negative guards\n" +msgstr "" + +#, python-format +msgid "allowing %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - no matching guards\n" +msgstr "" + +#, python-format +msgid "error removing undo: %s\n" +msgstr "" + +#, python-format +msgid "apply failed for patch %s" +msgstr "" + +#, python-format +msgid "patch didn't work out, merging %s\n" +msgstr "" + +#, python-format +msgid "update returned %d" +msgstr "" + +msgid "repo commit failed" +msgstr "" + +#, python-format +msgid "unable to read %s" +msgstr "" + +#, python-format +msgid "patch %s does not exist\n" +msgstr "" + +#, python-format +msgid "patch %s is not applied\n" +msgstr "" + +msgid "" +"Apply patchfile to the working directory.\n" +" patchfile: file name of patch" +msgstr "" + +msgid "patch failed, unable to continue (try -v)\n" +msgstr "" + +#, python-format +msgid "applying %s\n" +msgstr "%s を適用中\n" + +#, python-format +msgid "Unable to read %s\n" +msgstr "" + +#, python-format +msgid "imported patch %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"imported patch %s" +msgstr "" + +#, python-format +msgid "patch %s is empty\n" +msgstr "" + +msgid "patch failed, rejects left in working dir\n" +msgstr "" + +msgid "fuzz found when applying patch, stopping\n" +msgstr "" + +#, python-format +msgid "revision %d is not managed" +msgstr "" + +#, python-format +msgid "cannot delete revision %d above applied patches" +msgstr "" + +msgid "qdelete requires at least one revision or patch name" +msgstr "" + +#, python-format +msgid "cannot delete applied patch %s" +msgstr "" + +#, python-format +msgid "patch %s not in series file" +msgstr "" + +msgid "no patches applied" +msgstr "" + +msgid "working directory revision is not qtip" +msgstr "" + +msgid "local changes found, refresh first" +msgstr "" + +msgid "local changes found" +msgstr "" + +#, python-format +msgid "\"%s\" cannot be used as the name of a patch" +msgstr "" + +msgid "" +"options:\n" +" msg: a string or a no-argument function returning a string\n" +" " +msgstr "" + +#, python-format +msgid "patch \"%s\" already exists" +msgstr "" + +#, python-format +msgid "error unlinking %s\n" +msgstr "" + +msgid "returns (index, rev, patch)" +msgstr "" + +#, python-format +msgid "patch name \"%s\" is ambiguous:\n" +msgstr "" + +#, python-format +msgid "patch %s not in series" +msgstr "" + +msgid "(working directory not at tip)\n" +msgstr "" + +msgid "no patches in series\n" +msgstr "" + +#, python-format +msgid "cannot push to a previous patch: %s" +msgstr "" + +#, python-format +msgid "qpush: %s is already at the top\n" +msgstr "" + +#, python-format +msgid "guarded by %r" +msgstr "" + +msgid "no matching guards" +msgstr "" + +#, python-format +msgid "cannot push '%s' - %s\n" +msgstr "" + +msgid "all patches are currently applied\n" +msgstr "" + +msgid "patch series already fully applied\n" +msgstr "" + +msgid "cleaning up working directory..." +msgstr "" + +#, python-format +msgid "errors during apply, please fix and refresh %s\n" +msgstr "" + +#, python-format +msgid "now at: %s\n" +msgstr "" + +#, python-format +msgid "patch %s is not applied" +msgstr "" + +msgid "no patches applied\n" +msgstr "" + +#, python-format +msgid "qpop: %s is already at the top\n" +msgstr "" + +msgid "qpop: forcing dirstate update\n" +msgstr "" + +#, python-format +msgid "trying to pop unknown node %s" +msgstr "" + +msgid "popping would remove a revision not managed by this patch queue" +msgstr "" + +msgid "deletions found between repo revs" +msgstr "" + +msgid "patch queue now empty\n" +msgstr "" + +msgid "cannot refresh a revision with children" +msgstr "" + +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" +msgstr "" + +msgid "patch queue directory already exists" +msgstr "" + +#, python-format +msgid "patch %s is not in series file" +msgstr "" + +msgid "No saved patch data found\n" +msgstr "" + +#, python-format +msgid "restoring status: %s\n" +msgstr "" + +msgid "save entry has children, leaving it alone\n" +msgstr "" + +#, python-format +msgid "removing save entry %s\n" +msgstr "" + +#, python-format +msgid "saved queue repository parents: %s %s\n" +msgstr "" + +msgid "queue directory updating\n" +msgstr "" + +msgid "Unable to load queue repository\n" +msgstr "" + +msgid "save: no patches applied, exiting\n" +msgstr "" + +msgid "status is already saved\n" +msgstr "" + +msgid "hg patches saved state" +msgstr "" + +msgid "repo commit failed\n" +msgstr "" + +msgid "" +"If all_patches is False, return the index of the next pushable patch\n" +" in the series, or the series length. If all_patches is True, return " +"the\n" +" index of the first patch past the last applied one.\n" +" " +msgstr "" + +#, python-format +msgid "patch %s is already in the series file" +msgstr "" + +msgid "option \"-r\" not valid when importing files" +msgstr "" + +msgid "option \"-n\" not valid when importing multiple patches" +msgstr "" + +#, python-format +msgid "revision %d is the root of more than one branch" +msgstr "" + +#, python-format +msgid "revision %d is already managed" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of the queue" +msgstr "" + +#, python-format +msgid "revision %d has unmanaged children" +msgstr "" + +#, python-format +msgid "cannot import merge revision %d" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of %d" +msgstr "" + +msgid "-e is incompatible with import from -" +msgstr "" + +#, python-format +msgid "patch %s does not exist" +msgstr "" + +msgid "need --name to import a patch from -" +msgstr "" + +#, python-format +msgid "adding %s to series file\n" +msgstr "" + +msgid "" +"remove patches from queue\n" +"\n" +" The patches must not be applied, unless they are arguments to\n" +" the --rev parameter. At least one patch or revision is required.\n" +"\n" +" With --rev, mq will stop managing the named revisions (converting\n" +" them to regular mercurial changesets). The qfinish command should be\n" +" used as an alternative for qdel -r, as the latter option is deprecated.\n" +"\n" +" With --keep, the patch files are preserved in the patch directory." +msgstr "" + +msgid "print the patches already applied" +msgstr "" + +msgid "print the patches not yet applied" +msgstr "" + +msgid "" +"import a patch\n" +"\n" +" The patch is inserted into the series after the last applied patch.\n" +" If no patches have been applied, qimport prepends the patch\n" +" to the series.\n" +"\n" +" The patch will have the same name as its source file unless you\n" +" give it a new one with --name.\n" +"\n" +" You can register an existing patch inside the patch directory\n" +" with the --existing flag.\n" +"\n" +" With --force, an existing patch of the same name will be overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with --rev\n" +" (e.g. qimport --rev tip -n patch will place tip under mq control).\n" +" With --git, patches imported with --rev will use the git diff\n" +" format. See the diffs help topic for information on why this is\n" +" important for preserving rename/copy information and permission " +"changes.\n" +" " +msgstr "" + +msgid "" +"init a new queue repository\n" +"\n" +" The queue repository is unversioned by default. If -c is\n" +" specified, qinit will create a separate nested repository\n" +" for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one).\n" +" You can use qcommit to commit changes to this queue repository." +msgstr "" + +msgid "" +"clone main and patch repository at same time\n" +"\n" +" If source is local, destination will have no patches applied. If\n" +" source is remote, this command can not check if patches are\n" +" applied in source, so cannot guarantee that patches are not\n" +" applied in destination. If you clone remote repository, be sure\n" +" before that it has no patches applied.\n" +"\n" +" Source patch repository is looked for in <src>/.hg/patches by\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested mercurial repository, as\n" +" would be created by qinit -c.\n" +" " +msgstr "" + +msgid "versioned patch repository not found (see qinit -c)" +msgstr "" + +msgid "cloning main repo\n" +msgstr "" + +msgid "cloning patch repo\n" +msgstr "" + +msgid "stripping applied patches from destination repo\n" +msgstr "" + +msgid "updating destination repo\n" +msgstr "" + +msgid "commit changes in the queue repository" +msgstr "" + +msgid "print the entire series file" +msgstr "" + +msgid "print the name of the current patch" +msgstr "" + +msgid "print the name of the next patch" +msgstr "" + +msgid "all patches applied\n" +msgstr "" + +msgid "print the name of the previous patch" +msgstr "" + +msgid "only one patch applied\n" +msgstr "" + +msgid "" +"create a new patch\n" +"\n" +" qnew creates a new patch on top of the currently-applied patch (if " +"any).\n" +" It will refuse to run if there are any outstanding changes unless -f is\n" +" specified, in which case the patch will be initialized with them. You\n" +" may also use -I, -X, and/or a list of files after the patch name to add\n" +" only changes to matching files to the new patch, leaving the rest as\n" +" uncommitted modifications.\n" +"\n" +" -u and -d can be used to set the (given) user and date, respectively.\n" +" -U and -D set user to current user and date to current date.\n" +"\n" +" -e, -m or -l set the patch header as well as the commit message. If " +"none\n" +" is specified, the header is empty and the commit message is '[mq]: " +"PATCH'.\n" +"\n" +" Use the --git option to keep the patch in the git extended diff\n" +" format. Read the diffs help topic for more information on why this\n" +" is important for preserving permission changes and copy/rename\n" +" information.\n" +" " +msgstr "" + +msgid "" +"update the current patch\n" +"\n" +" If any file patterns are provided, the refreshed patch will contain " +"only\n" +" the modifications that match those patterns; the remaining " +"modifications\n" +" will remain in the working directory.\n" +"\n" +" If --short is specified, files currently included in the patch will\n" +" be refreshed just like matched files and remain in the patch.\n" +"\n" +" hg add/remove/copy/rename work as usual, though you might want to use\n" +" git-style patches (--git or [diff] git=1) to track copies and renames.\n" +" See the diffs help topic for more information on the git diff format.\n" +" " +msgstr "" + +msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" +msgstr "" + +msgid "" +"diff of the current patch and subsequent modifications\n" +"\n" +" Shows a diff which includes the current patch as well as any changes " +"which\n" +" have been made in the working directory since the last refresh (thus\n" +" showing what the current patch would become after a qrefresh).\n" +"\n" +" Use 'hg diff' if you only want to see the changes made since the last\n" +" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" +" current patch without including changes made since the qrefresh.\n" +" " +msgstr "" + +msgid "" +"fold the named patches into the current patch\n" +"\n" +" Patches must not yet be applied. Each patch will be successively\n" +" applied to the current patch in the order given. If all the\n" +" patches apply successfully, the current patch will be refreshed\n" +" with the new cumulative patch, and the folded patches will\n" +" be deleted. With -k/--keep, the folded patch files will not\n" +" be removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with\n" +" the current patch header, separated by a line of '* * *'." +msgstr "" + +msgid "qfold requires at least one patch name" +msgstr "" + +msgid "No patches applied" +msgstr "" + +#, python-format +msgid "Skipping already folded patch %s" +msgstr "" + +#, python-format +msgid "qfold cannot fold already applied patch %s" +msgstr "" + +#, python-format +msgid "Error folding patch %s" +msgstr "" + +msgid "push or pop patches until named patch is at top of stack" +msgstr "" + +msgid "" +"set or print guards for a patch\n" +"\n" +" Guards control whether a patch can be pushed. A patch with no\n" +" guards is always pushed. A patch with a positive guard (\"+foo\") is\n" +" pushed only if the qselect command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" has activated it.\n" +"\n" +" With no arguments, print the currently active guards.\n" +" With arguments, set guards for the named patch.\n" +" NOTE: Specifying negative guards now requires '--'.\n" +"\n" +" To set guards on another patch:\n" +" hg qguard -- other.patch +2.6.17 -stable\n" +" " +msgstr "" + +msgid "cannot mix -l/--list with options or arguments" +msgstr "" + +msgid "no patch to work with" +msgstr "" + +#, python-format +msgid "no patch named %s" +msgstr "" + +msgid "print the header of the topmost or specified patch" +msgstr "" + +msgid "" +"push the next patch onto the stack\n" +"\n" +" When --force is applied, all local changes in patched files will be " +"lost.\n" +" " +msgstr "" + +msgid "no saved queues found, please use -n\n" +msgstr "" + +#, python-format +msgid "merging with queue at: %s\n" +msgstr "" + +msgid "" +"pop the current patch off the stack\n" +"\n" +" By default, pops off the top of the patch stack. If given a patch name,\n" +" keeps popping off patches until the named patch is at the top of the " +"stack.\n" +" " +msgstr "" + +#, python-format +msgid "using patch queue: %s\n" +msgstr "" + +msgid "" +"rename a patch\n" +"\n" +" With one argument, renames the current patch to PATCH1.\n" +" With two arguments, renames PATCH1 to PATCH2." +msgstr "" + +#, python-format +msgid "%s already exists" +msgstr "" + +#, python-format +msgid "A patch named %s already exists in the series file" +msgstr "" + +msgid "restore the queue state saved by a rev" +msgstr "" + +msgid "save current queue state" +msgstr "" + +#, python-format +msgid "destination %s exists and is not a directory" +msgstr "" + +#, python-format +msgid "destination %s exists, use -f to force" +msgstr "" + +#, python-format +msgid "copy %s to %s\n" +msgstr "" + +msgid "" +"strip a revision and all its descendants from the repository\n" +"\n" +" If one of the working dir's parent revisions is stripped, the working\n" +" directory will be updated to the parent of the stripped revision.\n" +" " +msgstr "" + +msgid "" +"set or print guarded patches to push\n" +"\n" +" Use the qguard command to set or print guards on patch, then use\n" +" qselect to tell mq which guards to use. A patch will be pushed if it\n" +" has no guards or any positive guards match the currently selected " +"guard,\n" +" but will not be pushed if any negative guards match the current guard.\n" +" For example:\n" +"\n" +" qguard foo.patch -stable (negative guard)\n" +" qguard bar.patch +stable (positive guard)\n" +" qselect stable\n" +"\n" +" This activates the \"stable\" guard. mq will skip foo.patch (because\n" +" it has a negative match) but push bar.patch (because it\n" +" has a positive match).\n" +"\n" +" With no arguments, prints the currently active guards.\n" +" With one argument, sets the active guard.\n" +"\n" +" Use -n/--none to deactivate guards (no other arguments needed).\n" +" When no guards are active, patches with positive guards are skipped\n" +" and patches with negative guards are pushed.\n" +"\n" +" qselect can change the guards on applied patches. It does not pop\n" +" guarded patches by default. Use --pop to pop back to the last applied\n" +" patch that is not guarded. Use --reapply (which implies --pop) to push\n" +" back to the current patch afterwards, but skip guarded patches.\n" +"\n" +" Use -s/--series to print a list of all guards in the series file (no\n" +" other arguments needed). Use -v for more information." +msgstr "" + +msgid "guards deactivated\n" +msgstr "" + +#, python-format +msgid "number of unguarded, unapplied patches has changed from %d to %d\n" +msgstr "" + +#, python-format +msgid "number of guarded, applied patches has changed from %d to %d\n" +msgstr "" + +msgid "guards in series file:\n" +msgstr "" + +msgid "no guards in series file\n" +msgstr "" + +msgid "active guards:\n" +msgstr "" + +msgid "no active guards\n" +msgstr "" + +msgid "popping guarded patches\n" +msgstr "" + +msgid "reapplying unguarded patches\n" +msgstr "" + +msgid "" +"move applied patches into repository history\n" +"\n" +" Finishes the specified revisions (corresponding to applied patches) by\n" +" moving them out of mq control into regular repository history.\n" +"\n" +" Accepts a revision range or the --applied option. If --applied is\n" +" specified, all applied mq revisions are removed from mq control.\n" +" Otherwise, the given revisions must be at the base of the stack of\n" +" applied patches.\n" +"\n" +" This can be especially useful if your changes have been applied to an\n" +" upstream repository, or if you are about to push your changes to " +"upstream.\n" +" " +msgstr "" + +msgid "no revisions specified" +msgstr "" + +msgid "cannot commit over an applied mq patch" +msgstr "" + +msgid "source has mq patches applied" +msgstr "" + +#, python-format +msgid "mq status file refers to unknown node %s\n" +msgstr "" + +#, python-format +msgid "Tag %s overrides mq patch of the same name\n" +msgstr "" + +msgid "cannot import over an applied patch" +msgstr "" + +msgid "print first line of patch header" +msgstr "" + +msgid "hg qapplied [-s] [PATCH]" +msgstr "" + +msgid "use pull protocol to copy metadata" +msgstr "メタデータ複製に pull プロトコルを使用" + +msgid "do not update the new working directories" +msgstr "" + +msgid "use uncompressed transfer (fast over LAN)" +msgstr "非圧縮での転送(LAN での高速転送用)" + +msgid "location of source patch repo" +msgstr "" + +msgid "hg qclone [OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "hg qcommit [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qdiff [OPTION]... [FILE]..." +msgstr "" + +msgid "keep patch file" +msgstr "" + +msgid "stop managing a revision" +msgstr "" + +msgid "hg qdelete [-k] [-r REV]... [PATCH]..." +msgstr "" + +msgid "edit patch header" +msgstr "" + +msgid "keep folded patch files" +msgstr "" + +msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." +msgstr "" + +msgid "overwrite any local changes" +msgstr "" + +msgid "hg qgoto [OPTION]... PATCH" +msgstr "" + +msgid "list all patches and guards" +msgstr "" + +msgid "drop all guards" +msgstr "" + +msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." +msgstr "" + +msgid "hg qheader [PATCH]" +msgstr "" + +msgid "import file in patch dir" +msgstr "" + +msgid "patch file name" +msgstr "" + +msgid "overwrite existing files" +msgstr "" + +msgid "place existing revisions under mq control" +msgstr "" + +msgid "use git extended diff format" +msgstr "git 拡張差分形式を使用" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." +msgstr "" + +msgid "create queue repository" +msgstr "" + +msgid "hg qinit [-c]" +msgstr "" + +msgid "import uncommitted changes into patch" +msgstr "" + +msgid "add \"From: <current user>\" to patch" +msgstr "" + +msgid "add \"From: <given user>\" to patch" +msgstr "" + +msgid "add \"Date: <current date>\" to patch" +msgstr "" + +msgid "add \"Date: <given date>\" to patch" +msgstr "" + +msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." +msgstr "" + +msgid "hg qnext [-s]" +msgstr "" + +msgid "hg qprev [-s]" +msgstr "" + +msgid "pop all patches" +msgstr "" + +msgid "queue name to pop" +msgstr "" + +msgid "forget any local changes" +msgstr "" + +msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" +msgstr "" + +msgid "apply if the patch has rejects" +msgstr "" + +msgid "list patch name in commit text" +msgstr "" + +msgid "apply all patches" +msgstr "" + +msgid "merge from another queue" +msgstr "" + +msgid "merge queue name" +msgstr "" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" +msgstr "" + +msgid "refresh only files already in the patch and specified files" +msgstr "" + +msgid "add/update \"From: <current user>\" in patch" +msgstr "" + +msgid "add/update \"From: <given user>\" in patch" +msgstr "" + +msgid "update \"Date: <current date>\" in patch (if present)" +msgstr "" + +msgid "update \"Date: <given date>\" in patch (if present)" +msgstr "" + +msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." +msgstr "" + +msgid "hg qrename PATCH1 [PATCH2]" +msgstr "" + +msgid "delete save entry" +msgstr "" + +msgid "update queue working dir" +msgstr "" + +msgid "hg qrestore [-d] [-u] REV" +msgstr "" + +msgid "copy patch directory" +msgstr "" + +msgid "copy directory name" +msgstr "" + +msgid "clear queue status file" +msgstr "" + +msgid "force copy" +msgstr "" + +msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" +msgstr "" + +msgid "disable all guards" +msgstr "" + +msgid "list all guards in series file" +msgstr "" + +msgid "pop to before first guarded applied patch" +msgstr "" + +msgid "pop, then reapply patches" +msgstr "" + +msgid "hg qselect [OPTION]... [GUARD]..." +msgstr "" + +msgid "print patches not in series" +msgstr "" + +msgid "hg qseries [-ms]" +msgstr "" + +msgid "force removal with local changes" +msgstr "" + +msgid "bundle unrelated changesets" +msgstr "" + +msgid "no backups" +msgstr "" + +msgid "hg strip [-f] [-b] [-n] REV" +msgstr "" + +msgid "hg qtop [-s]" +msgstr "" + +msgid "hg qunapplied [-s] [PATCH]" +msgstr "" + +msgid "finish all applied changesets" +msgstr "" + +msgid "hg qfinish [-a] [REV...]" +msgstr "" + +msgid "" +"hook extension to email notifications on commits/pushes\n" +"\n" +"Subscriptions can be managed through hgrc. Default mode is to print\n" +"messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure notify extension and enable in hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go in here\n" +"\n" +" config items:\n" +"\n" +" REQUIRED:\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +" OPTIONAL:\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" +" # (serve == ssh or http, push, pull, bundle)\n" +" [email]\n" +" from = user@host.com # email address to send as if none given\n" +" [web]\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +" notify config file has same format as regular hgrc. it has two\n" +" sections so you can express subscriptions in whatever way is handier\n" +" for you.\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob " +"patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber " +"emails\n" +" pattern = user@host\n" +"\n" +" glob patterns are matched against path to repo root.\n" +"\n" +" if you like, you can put notify config file in repo that users can\n" +" push changes to, they can manage their own subscriptions." +msgstr "" + +msgid "email notification class." +msgstr "" + +msgid "strip leading slashes from local path, turn into web-safe path." +msgstr "" + +msgid "try to clean up email addresses." +msgstr "" + +msgid "return list of email addresses of subscribers to this repo." +msgstr "" + +msgid "format one changeset." +msgstr "" + +msgid "true if incoming changes from this source should be skipped." +msgstr "" + +msgid "send message." +msgstr "" + +#, python-format +msgid "%s: %d new changesets" +msgstr "" + +#, python-format +msgid "notify: sending %d subscribers %d changes\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (truncated from %d to %d lines):\n" +"\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (%d lines):\n" +"\n" +msgstr "" + +msgid "" +"send email notifications to interested subscribers.\n" +"\n" +" if used as changegroup hook, send one email for all changesets in\n" +" changegroup. else send one email per changeset." +msgstr "" + +#, python-format +msgid "notify: no subscribers to repo %s\n" +msgstr "" + +#, python-format +msgid "notify: changes have source \"%s\" - skipping\n" +msgstr "" + +msgid "" +"browse command output with external pager\n" +"\n" +"To set the pager that should be used, set the application variable:\n" +"\n" +" [pager]\n" +" pager = LESS='FSRX' less\n" +"\n" +"If no pager is set, the pager extensions uses the environment\n" +"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" +"is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" +"by setting:\n" +"\n" +" [pager]\n" +" quiet = True\n" +"\n" +"You can disable the pager for certain commands by adding them to the\n" +"pager.ignore list:\n" +"\n" +" [pager]\n" +" ignore = version, help, update\n" +"\n" +"You can also enable the pager only for certain commands using pager.attend:\n" +"\n" +" [pager]\n" +" attend = log\n" +"\n" +"If pager.attend is present, pager.ignore will be ignored.\n" +"\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to " +"specify\n" +"them in the global .hgrc\n" +msgstr "" + +msgid "" +"use suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to\n" +"the ancestors of a specific revision.\n" +"\n" +"For example, if you can refer to a revision as \"foo\", then:\n" +"\n" +"- foo^N = Nth parent of foo:\n" +" foo^0 = foo\n" +" foo^1 = first parent of foo\n" +" foo^2 = second parent of foo\n" +" foo^ = foo^1\n" +"\n" +"- foo~N = Nth first grandparent of foo\n" +" foo~0 = foo\n" +" foo~1 = foo^1 = foo^ = first parent of foo\n" +" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" +msgstr "" + +msgid "" +"sending Mercurial changesets as a series of patch emails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" +"which describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +"the first line of the changeset description as the subject text.\n" +"The message contains two or three body parts:\n" +"\n" +" The remainder of the changeset description.\n" +"\n" +" [Optional] The result of running diffstat on the patch.\n" +"\n" +" The patch itself, as generated by \"hg export\".\n" +"\n" +"Each message refers to all of its predecessors using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in\n" +"threaded mail and news readers, and in mail archives.\n" +"\n" +"For each changeset, you will be prompted with a diffstat summary and\n" +"the changeset summary, so you can be sure you are sending the right " +"changes.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.patchbomb =\n" +"\n" +"To configure other defaults, add a section like this to your hgrc file:\n" +"\n" +" [email]\n" +" from = My Name <my@email>\n" +" to = recipient1, recipient2, ...\n" +" cc = cc1, cc2, ...\n" +" bcc = bcc1, bcc2, ...\n" +"\n" +"Then you can use the \"hg email\" command to mail a series of changesets\n" +"as a patchbomb.\n" +"\n" +"To avoid sending patches prematurely, it is a good idea to first run\n" +"the \"email\" command with the \"-n\" option (test only). You will be\n" +"prompted for an email recipient address, a subject an an introductory\n" +"message describing the patches of your patchbomb. Then when all is\n" +"done, patchbomb messages are displayed. If PAGER environment variable\n" +"is set, your pager will be fired up once for each patchbomb message, so\n" +"you can verify everything is alright.\n" +"\n" +"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" +"each patchbomb message in a pager or sending the messages directly,\n" +"it will create a UNIX mailbox file with the patch emails. This\n" +"mailbox file can be previewed with any mail user agent which supports\n" +"UNIX mbox files, i.e. with mutt:\n" +"\n" +" % mutt -R -f mbox\n" +"\n" +"When you are previewing the patchbomb messages, you can use `formail'\n" +"(a utility that is commonly installed as part of the procmail package),\n" +"to send each message out:\n" +"\n" +" % formail -s sendmail -bm -t < mbox\n" +"\n" +"That should be all. Now your patchbomb is on its way out.\n" +"\n" +"You can also either configure the method option in the email section\n" +"to be a sendmail compatable mailer or fill out the [smtp] section so\n" +"that the patchbomb extension can automatically send patchbombs directly\n" +"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" +"for details." +msgstr "" + +msgid "Please enter a valid value.\n" +msgstr "" + +msgid "does the diffstat above look okay? " +msgstr "" + +msgid "diffstat rejected" +msgstr "" + +msgid "" +"send changesets by email\n" +"\n" +" By default, diffs are sent in the format generated by hg export,\n" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" +" introduction, which describes the series as a whole.\n" +"\n" +" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +" the first line of the changeset description as the subject text.\n" +" The message contains two or three body parts. First, the rest of\n" +" the changeset description. Next, (optionally) if the diffstat\n" +" program is installed, the result of running diffstat on the patch.\n" +" Finally, the patch itself, as generated by \"hg export\".\n" +"\n" +" With --outgoing, emails will be generated for patches not\n" +" found in the destination repository (or only those which are\n" +" ancestors of the specified revisions if any are provided)\n" +"\n" +" With --bundle, changesets are selected as for --outgoing,\n" +" but a single email containing a binary Mercurial bundle as an\n" +" attachment will be sent.\n" +"\n" +" Examples:\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +"\n" +" Before using this command, you will need to enable email in your hgrc.\n" +" See the [email] section in hgrc(5) for details.\n" +" " +msgstr "" + +msgid "Return the revisions present locally but not in dest" +msgstr "" + +msgid "specify at least one changeset with -r or -o" +msgstr "" + +msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" +msgstr "" + +msgid "too many destinations" +msgstr "" + +msgid "use only one form to specify the revision" +msgstr "" + +msgid "" +"\n" +"Write the introductory message for the patch series.\n" +"\n" +msgstr "" + +#, python-format +msgid "" +"This patch series consists of %d patches.\n" +"\n" +msgstr "" + +msgid "Final summary:\n" +msgstr "" + +msgid "Displaying " +msgstr "" + +msgid "Writing " +msgstr "" + +msgid "Sending " +msgstr "" + +msgid "send patches as attachments" +msgstr "" + +msgid "send patches as inline attachments" +msgstr "" + +msgid "email addresses of blind copy recipients" +msgstr "" + +msgid "email addresses of copy recipients" +msgstr "" + +msgid "add diffstat output to messages" +msgstr "" + +msgid "use the given date as the sending date" +msgstr "" + +msgid "use the given file as the series description" +msgstr "" + +msgid "email address of sender" +msgstr "" + +msgid "print messages that would be sent" +msgstr "" + +msgid "write messages to mbox file instead of sending them" +msgstr "" + +msgid "subject of first message (intro or single patch)" +msgstr "" + +msgid "email addresses of recipients" +msgstr "" + +msgid "omit hg patch header" +msgstr "" + +msgid "send changes not found in the target repository" +msgstr "" + +msgid "send changes not in target as a binary bundle" +msgstr "" + +msgid "a revision to send" +msgstr "" + +msgid "run even when remote repository is unrelated (with -b)" +msgstr "" + +msgid "a base changeset to specify instead of a destination (with -b)" +msgstr "" + +msgid "send an introduction email for a single patch" +msgstr "" + +msgid "hg email [OPTION]... [DEST]..." +msgstr "" + +msgid "" +"removes files not tracked by Mercurial\n" +"\n" +" Delete files not known to Mercurial. This is useful to test local and\n" +" uncommitted changes in an otherwise-clean source tree.\n" +"\n" +" This means that purge will delete:\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless they\n" +" contain files under source control managment\n" +" But it will leave untouched:\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" +"\n" +" If directories are given on the command line, only files in these\n" +" directories are considered.\n" +"\n" +" Be careful with purge, as you could irreversibly delete some files you\n" +" forgot to add to the repository. If you only want to print the list of\n" +" files that this program would delete, use the --print option.\n" +" " +msgstr "" + +#, python-format +msgid "%s cannot be removed" +msgstr "" + +#, python-format +msgid "warning: %s\n" +msgstr "" + +#, python-format +msgid "Removing file %s\n" +msgstr "" + +#, python-format +msgid "Removing directory %s\n" +msgstr "" + +msgid "abort if an error occurs" +msgstr "" + +msgid "purge ignored files too" +msgstr "" + +msgid "print the file names instead of deleting them" +msgstr "" + +msgid "end filenames with NUL, for use with xargs (implies -p)" +msgstr "" + +msgid "hg purge [OPTION]... [DIR]..." +msgstr "" + +msgid "" +"move sets of revisions to a different ancestor\n" +"\n" +"This extension lets you rebase changesets in an existing Mercurial " +"repository.\n" +"\n" +"For more information:\n" +"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +msgstr "" + +msgid "return the correct ancestor" +msgstr "" + +msgid "first revision, do not change ancestor\n" +msgstr "" + +msgid "" +"move changeset (and descendants) to a different branch\n" +"\n" +" Rebase uses repeated merging to graft changesets from one part of " +"history\n" +" onto another. This can be useful for linearizing local changes relative " +"to\n" +" a master development tree.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be " +"continued\n" +" with --continue or aborted with --abort.\n" +" " +msgstr "" + +msgid "cannot use both keepbranches and extrafn" +msgstr "" + +msgid "cannot use both abort and continue" +msgstr "" + +msgid "cannot use collapse with continue or abort" +msgstr "" + +msgid "abort and continue do not allow specifying revisions" +msgstr "" + +msgid "cannot specify both a revision and a base" +msgstr "" + +msgid "nothing to rebase\n" +msgstr "" + +msgid "rebase merging completed\n" +msgstr "" + +msgid "warning: new changesets detected on source branch, not stripping\n" +msgstr "" + +msgid "rebase completed\n" +msgstr "" + +#, python-format +msgid "%d revisions have been skipped\n" +msgstr "" + +msgid "" +"Skip commit if collapsing has been required and rev is not the last\n" +" revision, commit otherwise\n" +" " +msgstr "" + +msgid " set parents\n" +msgstr "" + +msgid "Rebase a single revision" +msgstr "" + +#, python-format +msgid "rebasing %d:%s\n" +msgstr "" + +#, python-format +msgid " future parents are %d and %d\n" +msgstr "" + +#, python-format +msgid " update to %d:%s\n" +msgstr "" + +msgid " already in target\n" +msgstr "" + +#, python-format +msgid " merge against %d:%s\n" +msgstr "" + +msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" +msgstr "" + +msgid "resuming interrupted rebase\n" +msgstr "" + +#, python-format +msgid "no changes, revision %d skipped\n" +msgstr "" + +#, python-format +msgid "next revision set to %s\n" +msgstr "" + +msgid "Return the new parent relationship of the revision that will be rebased" +msgstr "" + +#, python-format +msgid "cannot use revision %d as base, result would have 3 parents" +msgstr "" + +msgid "Update rebased mq patches - finalize and then import them" +msgstr "" + +#, python-format +msgid "revision %d is an mq patch (%s), finalize it.\n" +msgstr "" + +#, python-format +msgid "import mq patch %d (%s)\n" +msgstr "" + +msgid "Store the current status to allow recovery" +msgstr "" + +msgid "rebase status stored\n" +msgstr "" + +msgid "Remove the status files" +msgstr "" + +msgid "Restore a previously stored status" +msgstr "" + +msgid "rebase status resumed\n" +msgstr "" + +msgid "no rebase in progress" +msgstr "" + +msgid "Restore the repository to its original state" +msgstr "" + +msgid "warning: new changesets detected on target branch, not stripping\n" +msgstr "" + +msgid "rebase aborted\n" +msgstr "" + +msgid "Define which revisions are going to be rebased and where" +msgstr "" + +msgid "cannot rebase onto an applied mq patch" +msgstr "" + +msgid "cannot rebase an ancestor" +msgstr "" + +msgid "cannot rebase a descendant" +msgstr "" + +msgid "already working on current\n" +msgstr "" + +msgid "already working on the current branch\n" +msgstr "" + +#, python-format +msgid "rebase onto %d starting from %d\n" +msgstr "" + +msgid "unable to collapse, there is more than one external parent" +msgstr "" + +msgid "Call rebase after pull if the latter has been invoked with --rebase" +msgstr "" + +msgid "--update and --rebase are not compatible, ignoring the update flag\n" +msgstr "" + +msgid "Replace pull with a decorator to provide --rebase option" +msgstr "" + +msgid "rebase working directory to branch head" +msgstr "" + +msgid "keep original revisions" +msgstr "" + +msgid "keep original branches" +msgstr "" + +msgid "rebase from a given revision" +msgstr "" + +msgid "rebase from the base of a given revision" +msgstr "" + +msgid "rebase onto a given revision" +msgstr "" + +msgid "collapse the rebased revisions" +msgstr "" + +msgid "continue an interrupted rebase" +msgstr "" + +msgid "abort an interrupted rebase" +msgstr "" + +msgid "" +"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" +msgstr "" + +msgid "interactive change selection during commit or qrefresh" +msgstr "" + +msgid "" +"like patch.iterhunks, but yield different events\n" +"\n" +" - ('file', [header_lines + fromfile + tofile])\n" +" - ('context', [context_lines])\n" +" - ('hunk', [hunk_lines])\n" +" - ('range', (-start,len, +start,len, diffp))\n" +" " +msgstr "" + +msgid "scan lr while predicate holds" +msgstr "" + +msgid "" +"patch header\n" +"\n" +" XXX shoudn't we move this to mercurial/patch.py ?\n" +" " +msgstr "" + +msgid "this modifies a binary file (all or nothing)\n" +msgstr "" + +msgid "this is a binary file\n" +msgstr "" + +#, python-format +msgid "%d hunks, %d lines changed\n" +msgstr "" + +msgid "hunk -> (n+,n-)" +msgstr "" + +msgid "" +"patch hunk\n" +"\n" +" XXX shouldn't we merge this with patch.hunk ?\n" +" " +msgstr "" + +msgid "patch -> [] of hunks " +msgstr "" + +msgid "patch parsing state machine" +msgstr "" + +msgid "Interactively filter patch chunks into applied-only chunks" +msgstr "" + +msgid "" +"fetch next portion from chunks until a 'header' is seen\n" +" NB: header == new-file mark\n" +" " +msgstr "" + +msgid "" +"prompt query, and process base inputs\n" +"\n" +" - y/n for the rest of file\n" +" - y/n for the rest\n" +" - ? (help)\n" +" - q (quit)\n" +"\n" +" else, input is returned to the caller.\n" +" " +msgstr "" + +msgid "[Ynsfdaq?]" +msgstr "" + +msgid "y" +msgstr "" + +msgid "?" +msgstr "" + +msgid "y - record this change" +msgstr "" + +msgid "s" +msgstr "" + +msgid "f" +msgstr "" + +msgid "d" +msgstr "" + +msgid "a" +msgstr "" + +msgid "q" +msgstr "" + +msgid "user quit" +msgstr "" + +#, python-format +msgid "examine changes to %s?" +msgstr "" + +msgid " and " +msgstr "" + +#, python-format +msgid "record this change to %r?" +msgstr "" + +msgid "" +"interactively select changes to commit\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be candidates for recording.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" You will be prompted for whether to record changes to each\n" +" modified file, and for files with multiple changes, for each\n" +" change to use. For each query, the following responses are\n" +" possible:\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" +msgstr "" + +msgid "" +"interactively record a new patch\n" +"\n" +" see 'hg help qnew' & 'hg help record' for more information and usage\n" +" " +msgstr "" + +msgid "'mq' extension not loaded" +msgstr "" + +msgid "running non-interactively, use commit instead" +msgstr "" + +msgid "" +"This is generic record driver.\n" +"\n" +" It's job is to interactively filter local changes, and accordingly\n" +" prepare working dir into a state, where the job can be delegated to\n" +" non-interactive commit command such as 'commit' or 'qrefresh'.\n" +"\n" +" After the actual job is done by non-interactive command, working " +"dir\n" +" state is restored to original.\n" +"\n" +" In the end we'll record intresting changes, and everything else will " +"be\n" +" left in place, so the user can continue his work.\n" +" " +msgstr "" + +msgid "no changes to record\n" +msgstr "" + +#, python-format +msgid "backup %r as %r\n" +msgstr "" + +msgid "applying patch\n" +msgstr "" + +msgid "patch failed to apply" +msgstr "" + +#, python-format +msgid "restoring %r to %r\n" +msgstr "" + +msgid "hg record [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qrecord [OPTION]... PATCH [FILE]..." +msgstr "" + +msgid "" +"patch transplanting tool\n" +"\n" +"This extension allows you to transplant patches from another branch.\n" +"\n" +"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" +"from a changeset hash to its hash in the source repository.\n" +msgstr "" + +msgid "" +"returns True if a node is already an ancestor of parent\n" +" or has already been transplanted" +msgstr "" + +msgid "apply the revisions in revmap one by one in revision order" +msgstr "" + +#, python-format +msgid "skipping already applied revision %s\n" +msgstr "" + +#, python-format +msgid "skipping merge changeset %s:%s\n" +msgstr "" + +#, python-format +msgid "%s merged at %s\n" +msgstr "" + +#, python-format +msgid "%s transplanted to %s\n" +msgstr "" + +msgid "arbitrarily rewrite changeset before applying it" +msgstr "" + +#, python-format +msgid "filtering %s\n" +msgstr "" + +msgid "filter failed" +msgstr "" + +msgid "apply the patch in patchfile to the repository as a transplant" +msgstr "" + +msgid "can only omit patchfile if merging" +msgstr "" + +#, python-format +msgid "%s: empty changeset" +msgstr "" + +msgid "Fix up the merge and run hg transplant --continue" +msgstr "" + +msgid "recover last transaction and apply remaining changesets" +msgstr "" + +#, python-format +msgid "%s transplanted as %s\n" +msgstr "" + +msgid "commit working directory using journal metadata" +msgstr "" + +msgid "transplant log file is corrupt" +msgstr "" + +#, python-format +msgid "working dir not at transplant parent %s" +msgstr "" + +msgid "commit failed" +msgstr "" + +msgid "journal changelog metadata for later recover" +msgstr "" + +msgid "remove changelog journal" +msgstr "" + +msgid "interactively transplant changesets" +msgstr "" + +msgid "apply changeset? [ynmpcq?]:" +msgstr "" + +msgid "" +"transplant changesets from another branch\n" +"\n" +" Selected changesets will be applied on top of the current working\n" +" directory with the log of the original changeset. If --log is\n" +" specified, log messages will have a comment appended of the form:\n" +"\n" +" (transplanted from CHANGESETHASH)\n" +"\n" +" You can rewrite the changelog message with the --filter option.\n" +" Its argument will be invoked with the current changelog message\n" +" as $1 and the patch as $2.\n" +"\n" +" If --source is specified, selects changesets from the named\n" +" repository. If --branch is specified, selects changesets from the\n" +" branch holding the named revision, up to that revision. If --all\n" +" is specified, all changesets on the branch will be transplanted,\n" +" otherwise you will be prompted to select the changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected branch\n" +" (up to the named revision) onto your current working directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as\n" +" merge changesets. You will not be prompted to transplant any\n" +" ancestors of a merged transplant, and you can merge descendants\n" +" of them normally instead of transplanting them.\n" +"\n" +" If no merges or revisions are provided, hg transplant will start\n" +" an interactive changeset browser.\n" +"\n" +" If a changeset application fails, you can fix the merge by hand and\n" +" then resume where you left off by calling hg transplant --continue.\n" +" " +msgstr "" + +msgid "--continue is incompatible with branch, all or merge" +msgstr "" + +msgid "no source URL, branch tag or revision list provided" +msgstr "" + +msgid "--all requires a branch revision" +msgstr "" + +msgid "--all is incompatible with a revision list" +msgstr "" + +msgid "no revision checked out" +msgstr "" + +msgid "outstanding uncommitted merges" +msgstr "" + +msgid "outstanding local changes" +msgstr "" + +msgid "pull patches from REPOSITORY" +msgstr "" + +msgid "pull patches from branch BRANCH" +msgstr "" + +msgid "pull all changesets up to BRANCH" +msgstr "" + +msgid "skip over REV" +msgstr "" + +msgid "merge at REV" +msgstr "" + +msgid "append transplant info to log message" +msgstr "" + +msgid "continue last transplant session after repair" +msgstr "" + +msgid "filter changesets through FILTER" +msgstr "" + +msgid "" +"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "" + +msgid "" +"allow to use MBCS path with problematic encoding.\n" +"\n" +"Some MBCS encodings are not good for some path operations\n" +"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" +"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" +"encoding\". This extension can be used to fix the issue with those\n" +"encodings by wrapping some functions to convert to unicode string\n" +"before path operation.\n" +"\n" +"This extension is usefull for:\n" +" * Japanese Windows users using shift_jis encoding.\n" +" * Chinese Windows users using big5 encoding.\n" +" * All users who use a repository with one of problematic encodings\n" +" on case-insensitive file system.\n" +"\n" +"This extension is not needed for:\n" +" * Any user who use only ascii chars in path.\n" +" * Any user who do not use any of problematic encodings.\n" +"\n" +"Note that there are some limitations on using this extension:\n" +" * You should use single encoding in one repository.\n" +" * You should set same encoding for the repository by locale or HGENCODING.\n" +"\n" +"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" +"\n" +" [extensions]\n" +" hgext.win32mbcs =\n" +"\n" +"Path encoding conversion are done between unicode and util._encoding\n" +"which is decided by mercurial from current locale setting or HGENCODING.\n" +"\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgstr "" + +msgid "[win32mbcs] cannot activate on this platform.\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] activated with encoding: %s\n" +msgstr "" + +#, python-format +msgid "" +"WARNING: %s already has %s line endings\n" +"and does not need EOL conversion by the win32text plugin.\n" +"Before your next commit, please reconsider your encode/decode settings in \n" +"Mercurial.ini or %s.\n" +msgstr "" + +#, python-format +msgid "Attempt to commit or push text file(s) using %s line endings\n" +msgstr "" + +#, python-format +msgid "in %s: %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"To prevent this mistake in your local repository,\n" +"add to Mercurial.ini or .hg/hgrc:\n" +"\n" +"[hooks]\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s\n" +"\n" +"and also consider adding:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = %sencode:\n" +"[decode]\n" +"** = %sdecode:\n" +msgstr "" + +msgid "" +"zeroconf support for mercurial repositories\n" +"\n" +"Zeroconf enabled repositories will be announced in a network without the " +"need\n" +"to configure a server or a service. They can be discovered without knowing\n" +"their actual IP address.\n" +"\n" +"To use the zeroconf extension add the following entry to your hgrc file:\n" +"\n" +"[extensions]\n" +"hgext.zeroconf =\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\" in " +"your\n" +"repository.\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\".\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" +msgstr "" + +msgid "archive prefix contains illegal components" +msgstr "" + +msgid "cannot give prefix when archiving to files" +msgstr "" + +#, python-format +msgid "unknown archive type '%s'" +msgstr "" + +msgid "invalid changegroup" +msgstr "" + +msgid "unknown parent" +msgstr "" + +#, python-format +msgid "integrity check failed on %s:%d" +msgstr "" + +#, python-format +msgid "%s: not a Mercurial bundle file" +msgstr "" + +#, python-format +msgid "%s: unknown bundle version" +msgstr "" + +#, python-format +msgid "%s: unknown bundle compression type" +msgstr "" + +msgid "cannot create new bundle repository" +msgstr "" + +#, python-format +msgid "premature EOF reading chunk (got %d bytes, expected %d)" +msgstr "" + +#, python-format +msgid "username %s contains a newline" +msgstr "" + +msgid "options --message and --logfile are mutually exclusive" +msgstr "" + +#, python-format +msgid "can't read commit message '%s': %s" +msgstr "" + +msgid "limit must be a positive integer" +msgstr "" + +msgid "limit must be positive" +msgstr "" + +msgid "too many revisions specified" +msgstr "" + +#, python-format +msgid "invalid format spec '%%%s' in output file name" +msgstr "" + +#, python-format +msgid "adding %s\n" +msgstr "%s を追加登録中\n" + +#, python-format +msgid "removing %s\n" +msgstr "%s を登録解除中\n" + +#, python-format +msgid "recording removal of %s as rename to %s (%d%% similar)\n" +msgstr "" + +#, python-format +msgid "%s: not copying - file is not managed\n" +msgstr "" + +#, python-format +msgid "%s: not copying - file has been marked for remove\n" +msgstr "" + +#, python-format +msgid "%s: not overwriting - %s collides with %s\n" +msgstr "" + +#, python-format +msgid "%s: not overwriting - file exists\n" +msgstr "" + +#, python-format +msgid "%s: deleted in working copy\n" +msgstr "" + +#, python-format +msgid "%s: cannot copy - %s\n" +msgstr "" + +#, python-format +msgid "%s %s to %s\n" +msgstr "" + +#, python-format +msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" +msgstr "" + +msgid "no source or destination specified" +msgstr "" + +msgid "no destination specified" +msgstr "" + +msgid "with multiple sources, destination must be an existing directory" +msgstr "" + +#, python-format +msgid "destination %s is not a directory" +msgstr "" + +msgid "no files to copy" +msgstr "" + +msgid "(consider using --after)\n" +msgstr "" + +#, python-format +msgid "changeset: %d:%s\n" +msgstr "" + +#, python-format +msgid "branch: %s\n" +msgstr "" + +#, python-format +msgid "tag: %s\n" +msgstr "" + +#, python-format +msgid "parent: %d:%s\n" +msgstr "" + +#, python-format +msgid "manifest: %d:%s\n" +msgstr "" + +#, python-format +msgid "user: %s\n" +msgstr "" + +#, python-format +msgid "date: %s\n" +msgstr "" + +msgid "files+:" +msgstr "" + +msgid "files-:" +msgstr "" + +msgid "files:" +msgstr "" + +#, python-format +msgid "files: %s\n" +msgstr "" + +#, python-format +msgid "copies: %s\n" +msgstr "" + +#, python-format +msgid "extra: %s=%s\n" +msgstr "" + +msgid "description:\n" +msgstr "" + +#, python-format +msgid "summary: %s\n" +msgstr "" + +#, python-format +msgid "%s: no key named '%s'" +msgstr "" + +#, python-format +msgid "%s: %s" +msgstr "" + +#, python-format +msgid "Found revision %s from %s\n" +msgstr "" + +msgid "revision matching date not found" +msgstr "" + +#, python-format +msgid "cannot follow nonexistent file: \"%s\"" +msgstr "" + +#, python-format +msgid "%s:%s copy source revision cannot be found!\n" +msgstr "" + +msgid "can only follow copies/renames for explicit file names" +msgstr "" + +#, python-format +msgid "file %s not found!" +msgstr "" + +#, python-format +msgid "no match under directory %s!" +msgstr "" + +#, python-format +msgid "can't commit %s: unsupported file type!" +msgstr "" + +#, python-format +msgid "file %s not tracked!" +msgstr "" + +msgid "" +"add the specified files on the next commit\n" +"\n" +" Schedule files to be version controlled and added to the repository.\n" +"\n" +" The files will be added to the repository at the next commit. To\n" +" undo an add before that, see hg revert.\n" +"\n" +" If no names are given, add all files in the repository.\n" +" " +msgstr "" +"指定されたファイルを次回コミットから構成管理に追加登録\n" +"\n" +" 構成管理へのファイルの追加登録を予約します。\n" +"\n" +" 指定されたファイルは次回のコミットの際にリポジトリに追加されます。\n" +" コミット前に追加登録を取り消す方法は、hg revert を参照してください。\n" +"\n" +" ファイル名指定が無い場合、作業領域中の全てのファイルを追加登録します。\n" +" " + +msgid "" +"add all new files, delete all missing files\n" +"\n" +" Add all new files and remove all missing files from the repository.\n" +"\n" +" New files are ignored if they match any of the patterns in .hgignore. " +"As\n" +" with add, these changes take effect at the next commit.\n" +"\n" +" Use the -s option to detect renamed files. With a parameter > 0,\n" +" this compares every removed file with every added file and records\n" +" those similar enough as renames. This option takes a percentage\n" +" between 0 (disabled) and 100 (files must be identical) as its\n" +" parameter. Detecting renamed files this way can be expensive.\n" +" " +msgstr "" +"新規ファイルの追加登録、および不在ファイルの登録除外\n" +"\n" +" 作業領域中の新規ファイルの追加登録、および不在ファイルの登録除外を\n" +" 行ないます。\n" +"\n" +" .hgignore に記述されたパターンに合致する新規ファイルは無視されます。\n" +" hg add コマンドと同様に、このコマンドの実行が効果を発揮するのは、\n" +" 次回のコミット実施後です。\n" +"\n" +" ファイルの改名を検知するには -s オプションを使用します。\n" +" 0 より大きな値が指定された場合、追加・除外ファイルの全てが比較され、\n" +" 改名とみなせるか否かが判定されます。このオプションには、0(改名比較無効)\n" +" から 100 (完全一致)までの範囲でパーセンテージを指定します。\n" +" 改名判定には実行時間を要する可能性があります。\n" +" " + +msgid "similarity must be a number" +msgstr "類似度は数値でなければなりません" + +msgid "similarity must be between 0 and 100" +msgstr "類似度は0から100の間でなければなりません" + +msgid "" +"show changeset information per file line\n" +"\n" +" List changes in files, showing the revision id responsible for each " +"line\n" +"\n" +" This command is useful to discover who did a change or when a change " +"took\n" +" place.\n" +"\n" +" Without the -a option, annotate will avoid processing files it\n" +" detects as binary. With -a, annotate will generate an annotation\n" +" anyway, probably with undesirable results.\n" +" " +msgstr "" +"ファイル行毎のチェンジセット情報表示\n" +"\n" +" ファイルの各行毎に、その内容が由来するリビジョンIDを表示します。\n" +"\n" +" 本コマンドは、変更の実施者ないし実施次期を特定するのに有用です。\n" +"\n" +" -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n" +" 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n" +" 全てのファイルに処理を実施します。\n" +" " + +msgid "at least one file name or pattern required" +msgstr "ファイル名ないしパターンを最低1つ指定してください" + +msgid "at least one of -n/-c is required for -l" +msgstr "-l 指定時には -n/-c のうち最低でもいずれか1つの指定が必要です" + +#, python-format +msgid "%s: binary file\n" +msgstr "%s: バイナリファイルです\n" + +msgid "" +"create unversioned archive of a repository revision\n" +"\n" +" By default, the revision used is the parent of the working\n" +" directory; use \"-r\" to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use \"-t\". Valid\n" +" types are:\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" +"\n" +" The exact name of the destination archive or directory is given\n" +" using a format string; see \"hg help export\" for details.\n" +"\n" +" Each member added to an archive file has a directory prefix\n" +" prepended. Use \"-p\" to specify a format string for the prefix.\n" +" The default is the basename of the archive, with suffixes removed.\n" +" " +msgstr "" +"リポジトリ外へのアーカイブの生成\n" +"\n" +" 指定が無い場合、作業領域の親リビジョンが使用されます。\n" +" 他のリビジョンを指定する場合は \"-r\" を使用します。\n" +"\n" +" 生成するアーカイブの種別を指定する場合は、\"-t\" を使用します。\n" +" 使用可能な種別は:\n" +"\n" +" \"files\" (無指定時): a directory full of files\n" +" \"tar\": 非圧縮の tar アーカイブ形式\n" +" \"tbz2\": bzip2 圧縮の tar アーカイブ形式\n" +" \"tgz\": gzip 圧縮の tar アーカイブ形式\n" +" \"uzip\": 非圧縮の zip アーカイブ形式\n" +" \"zip\": 圧縮有り zip アーカイブ形式\n" +"\n" +" 最終的なアーカイブ生成先となるファイル名ないしディレクトリ名は、\n" +" 置換指定を使用して指定することができます。\n" +" 置換指定に関する詳細は \"hg help export\" を参照してください。\n" +"\n" +" アーカイブに包含されるファイルには、展開時格納先を指定するための\n" +" ディレクトリ前置詞が付与されます。 \"-p\" により前置詞を指定可能です。\n" +" ディレクトリ前置詞が無指定の時は、アーカイブファイルのファイル名から\n" +" 接尾辞を除いたものが使用されます。\n" +" " + +msgid "no working directory: please specify a revision" +msgstr "作業領域からリビジョンを特定できません。リビジョンを指定してください。" + +msgid "repository root cannot be destination" +msgstr "リポジトリのルートを作成先に指定することはできません。" + +msgid "cannot archive plain files to stdout" +msgstr "通常ファイルのアーカイブを標準出力に出力することはできません。" + +msgid "" +"reverse effect of earlier changeset\n" +"\n" +" Commit the backed out changes as a new changeset. The new\n" +" changeset is a child of the backed out changeset.\n" +"\n" +" If you back out a changeset other than the tip, a new head is\n" +" created. This head will be the new tip and you should merge this\n" +" backout changeset with another head (current one by default).\n" +"\n" +" The --merge option remembers the parent of the working directory\n" +" before starting the backout, then merges the new head with that\n" +" changeset afterwards. This saves you from doing the merge by\n" +" hand. The result of this merge is not committed, as for a normal\n" +" merge.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"以前のチェンジセットの効果の打ち消し\n" +"\n" +" 打ち消し用チェンジセットを新規チェンジセットとしてコミットします。\n" +" 新規チェンジセットは、打消し対象チェンジセットの子チェンジセットとして\n" +" 作成されます。\n" +"\n" +" tip 以外のチェンジセットを打ち消す場合、新規ヘッドが生成されます。\n" +" このヘッドは新規 tip となりますので、この打ち消しチェンジセットと\n" +" 他のヘッド(通常は打ち消し実施前のヘッド)をマージしてください。\n" +"\n" +" --merge オプション指定時は、実施前に作業領域の親チェンジセットが\n" +" 記録され、実施後に新たなヘッドとそのチェンジセットがマージされます。\n" +" これにより手動マージの手間が省けます。通常の merge と同様に、\n" +" このマージ結果は自動的には commit されません。\n" +"\n" +" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" +" " + +msgid "please specify just one revision" +msgstr "リビジョン指定は1つだけです" + +msgid "please specify a revision to backout" +msgstr "打ち消し対象リビジョンを指定してください" + +msgid "cannot back out change on a different branch" +msgstr "異なるブランチのチェンジセットを打ち消すことはできません" + +msgid "cannot back out a change with no parents" +msgstr "親の無いチェンジセットを打ち消すことはできません" + +msgid "cannot back out a merge changeset without --parent" +msgstr "--parent 指定が無いとマージチェンジセットは打ち消せません" + +#, python-format +msgid "%s is not a parent of %s" +msgstr "%s は %s の親チェンジセットではありません" + +msgid "cannot use --parent on non-merge changeset" +msgstr "非マージチェンジセットには --parent を指定できません" + +#, python-format +msgid "Backed out changeset %s" +msgstr "チェンジセット %s の打ち消し" + +#, python-format +msgid "changeset %s backs out changeset %s\n" +msgstr "チェンジセット %s はチェンジセット %s を打ち消します\n" + +#, python-format +msgid "merging with changeset %s\n" +msgstr "チェンジセット %s とマージ中\n" + +msgid "the backout changeset is a new head - do not forget to merge\n" +msgstr "打ち消しチェンジセットによりヘッドが増えます - マージを忘れずに\n" + +msgid "(use \"backout --merge\" if you want to auto-merge)\n" +msgstr "(自動的にマージしたい場合は \"backout --merge\")\n" + +msgid "" +"subdivision search of changesets\n" +"\n" +" This command helps to find changesets which introduce problems.\n" +" To use, mark the earliest changeset you know exhibits the problem\n" +" as bad, then mark the latest changeset which is free from the\n" +" problem as good. Bisect will update your working directory to a\n" +" revision for testing (unless the --noupdate option is specified).\n" +" Once you have performed tests, mark the working directory as bad\n" +" or good and bisect will either update to another candidate changeset\n" +" or announce that it has found the bad revision.\n" +"\n" +" As a shortcut, you can also use the revision argument to mark a\n" +" revision as good or bad without checking it out first.\n" +"\n" +" If you supply a command it will be used for automatic bisection. Its " +"exit\n" +" status will be used as flag to mark revision as bad or good. In case " +"exit\n" +" status is 0 the revision is marked as good, 125 - skipped, 127 (command " +"not\n" +" found) - bisection will be aborted and any other status bigger than 0 " +"will\n" +" mark revision as bad.\n" +" " +msgstr "" +"チェンジセットの分割探索\n" +"\n" +" 問題発生契機となるチェンジセットの特定を補助します。\n" +" 使用開始の際には、問題が発生するのが既知の最古のチェンジセットを\n" +" bad とマークし、問題の発生しない最も新しいチェンジセットを\n" +" good とマークします。bisect コマンドは作業領域を検証対象チェンジセット\n" +" へと更新します(--noupdate 指定時除く)。\n" +" 当該チェンジセットを検証したなら、作業領域(のチェンジセット)を bad \n" +" あるいは good でマークしてください。bisect は作業領域を次の検証候補\n" +" チェンジセットで更新するか、bad リビジョンを特定できた旨を出力します。\n" +"\n" +" 手短には、リビジョン指定を使用して、作業領域の更新無しでリビジョンを\n" +" good ないし bad にマークすることもできます。\n" +"\n" +" コマンドを指定した場合は、自動的な分割探索に使用されます。\n" +" コマンドの終了コードはリビジョンに対する bad ないし good のマーク付け\n" +" に使用されます。終了コード 0 は good、125 はスキップ、127(コマンドが\n" +" 見つからない場合)は分割検索中断、それ以外の 0 より大きい終了コードは\n" +" bad のマーク付けとみなされます。\n" +" " + +#, python-format +msgid "The first %s revision is:\n" +msgstr "" + +#, python-format +msgid "Due to skipped revisions, the first %s revision could be any of:\n" +msgstr "" + +msgid "cannot bisect (no known good revisions)" +msgstr "" + +msgid "cannot bisect (no known bad revisions)" +msgstr "" + +msgid "(use of 'hg bisect <cmd>' is deprecated)\n" +msgstr "" + +msgid "incompatible arguments" +msgstr "" + +#, python-format +msgid "failed to execute %s" +msgstr "" + +#, python-format +msgid "%s killed" +msgstr "" + +#, python-format +msgid "Changeset %s: %s\n" +msgstr "" + +#, python-format +msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgstr "" + +msgid "" +"set or show the current branch name\n" +"\n" +" With no argument, show the current branch name. With one argument,\n" +" set the working directory branch name (the branch does not exist in\n" +" the repository until the next commit).\n" +"\n" +" Unless --force is specified, branch will not let you set a\n" +" branch name that shadows an existing branch.\n" +"\n" +" Use --clean to reset the working directory branch to that of the\n" +" parent of the working directory, negating a previous branch change.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" +"現ブランチ名の設定ないし表示\n" +"\n" +" 引数無しの場合、現ブランチ名を表示します。引数有りの場合、\n" +" 作業領域のブランチ名を設定します(ブランチ生成は次回コミット時)。\n" +"\n" +" --force 指定が無い場合、既存ブランチを隠すブランチ名は設定できません。\n" +"\n" +" --clean 指定により、以前のブランチ名設定を無効にして、作業領域の\n" +" 親リビジョンのブランチ名に戻します。\n" +"\n" +" 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n" +" 使用してください。\n" +" " + +#, python-format +msgid "reset working directory to branch %s\n" +msgstr "" + +msgid "a branch of the same name already exists (use --force to override)" +msgstr "" + +#, python-format +msgid "marked working directory as branch %s\n" +msgstr "" + +msgid "" +"list repository named branches\n" +"\n" +" List the repository's named branches, indicating which ones are\n" +" inactive. If active is specified, only show active branches.\n" +"\n" +" A branch is considered active if it contains repository heads.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" +"リポジトリ中の名前付きブランチの一覧\n" +"\n" +" リポジトリ中の名前付きブランチを、非活性(inactive)のものも含め\n" +" 一覧表示します。--active 指定時には、活性のもののみ表示されます。\n" +"\n" +" リポジトリ中にヘッドを持つブランチは活性とみなされます。\n" +"\n" +" 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n" +" 使用してください。\n" +" " + +msgid "" +"create a changegroup file\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" found in the other repository.\n" +"\n" +" If no destination repository is specified the destination is\n" +" assumed to have all the nodes specified by one or more --base\n" +" parameters. To create a bundle containing all changesets, use\n" +" --all (or --base null). To change the compression method applied,\n" +" use the -t option (by default, bundles are compressed using bz2).\n" +"\n" +" The bundle file can then be transferred using conventional means and\n" +" applied to another repository with the unbundle or pull command.\n" +" This is useful when direct push and pull are not available or when\n" +" exporting an entire repository is undesirable.\n" +"\n" +" Applying bundles preserves all changeset contents including\n" +" permissions, copy/rename information, and revision history.\n" +" " +msgstr "" +"バンドルファイルの生成\n" +"\n" +" 比較対象リポジトリに存在しないチェンジセットの情報をまとめた、圧縮付き\n" +" バンドルファイルを生成します。\n" +"\n" +" 比較対象リポジトリが指定されない場合、1つ以上の --base で指定された\n" +" 全てのチェンジセットを持つリポジトリが想定されます。\n" +" 全てのチェンジセットを含むバンドルファイルを生成するには、--all \n" +" (ないし \"--base null\") を指定してください。圧縮方式を変更する場合は\n" +" -t オプションを使用します(無指定時は bz2 圧縮)。\n" +"\n" +" 生成されたバンドルファイルは、任意の方法で転送し、他のリポジトリ上で\n" +" unbundle ないし pull コマンドにより適用可能です。\n" +" push/pull による直接転送ができない場合や、リポジトリ全体の公開が\n" +" 望ましく無い場合に、バンドルファイルは有用です。\n" +"\n" +" バンドルの適用により、権限設定、複製／改名、変更履歴といった情報を含む\n" +" 全ての更新内容が取り込まれます。\n" +" " + +msgid "--base is incompatible with specifiying a destination" +msgstr "" + +msgid "unknown bundle type specified with --type" +msgstr "" + +msgid "" +"output the current or given revision of files\n" +"\n" +" Print the specified files as they were at the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are the same as\n" +" for the export command, with the following additions:\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repo root\n" +" %p root-relative path name of file being printed\n" +" " +msgstr "" +"指定されたリビジョンのファイル内容の出力\n" +"\n" +" 特定のファイルの指定されたリビジョンにおける内容を出力します。\n" +" リビジョン指定が無い場合、作業領域の親リビジョンか、\n" +" 作業領域の更新前なら tip が使用されます。\n" +"\n" +" (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n" +" 置換指定は export コマンドで指定可能なものに加え、\n" +" 以下のものが指定可能です。\n" +"\n" +" %s 対象ファイルのベース名\n" +" %d 対象ファイルの格納ディレクトリ、ないし '.'\n" +" %p 対象ファイルのリポジトリルートからの相対パス\n" +" " + +msgid "" +"make a copy of an existing repository\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" The location of the source is added to the new repository's\n" +" .hg/hgrc file, as the default to be used for future pulls.\n" +"\n" +" For efficiency, hardlinks are used for cloning whenever the source\n" +" and destination are on the same filesystem (note this applies only\n" +" to the repository data, not to the checked out files). Some\n" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\n" +" using full hardlinks with\n" +"\n" +" $ cp -al REPO REPOCLONE\n" +"\n" +" This is the fastest way to clone, but it is not always safe. The\n" +" operation is not atomic (making sure REPO is not modified during\n" +" the operation is up to you) and you have to make sure your editor\n" +" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" If you use the -r option to clone up to a specific revision, no\n" +" subsequent revisions will be present in the cloned repository.\n" +" This option implies --pull, even on local repositories.\n" +"\n" +" If the -U option is used, the new clone will contain only a repository\n" +" (.hg) and no working copy (the working copy parent is the null " +"revision).\n" +"\n" +" See 'hg help urls' for valid source format details.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination, but no\n" +" .hg/hgrc and working directory will be created on the remote side.\n" +" Look at the help text for urls for important details about ssh:// URLs.\n" +" " +msgstr "" +"既存リポジトリの複製\n" +"\n" +" 既存リポジトリを、新規ディレクトリに複製します。\n" +"\n" +" 複製先ディレクトリが指定されない場合、複製元のベース名を使用します。\n" +"\n" +" 複製元リポジトリ位置は、複製先リポジトリの .hg/hgrc ファイルに対して\n" +" 将来的な pull 実施に備えて default 名義で記録されます。\n" +"\n" +" 効率上の理由から、複製元／複製先が同一ファイルシステム上にある場合、\n" +" (リポジトリの内部データに対してのみ)ハードリンクが使用されます。\n" +" AFS を含む幾つかのファイルシステムは、ハードリンク実装が不適切である\n" +" にも関わらず、エラー通知がありません。このような場合にハードリンクを\n" +" 抑止するには --pull オプションを使用します。\n" +"\n" +" リポジトリの内部データと作業領域中のファイル全てに対して、ハードリンク\n" +" による複製を作成するには、以下の方法が使えるかも知れません。\n" +"\n" +" $ cp -al REPO REPOCLONE\n" +"\n" +" この方法は最速の複製方法かもしれませんが、常に安全とは限りません。\n" +" 操作の単一性は保障されません(REPO の複製中改変の防止は利用者の責務)し、\n" +" 利用するエディタに改変時のハードリンク破棄をさせる必要があります\n" +" (Emacs および多くの Linux Kernel ツールはそのように振舞います)。\n" +" この制約は、.hg ディレクトリ配下にメタデータを配置する、MQ のような\n" +" エクステンションとは相容れないものです。\n" +"\n" +" -r オプションによるリビジョン指定複製を行なう場合、複製先リポジトリには\n" +" 指定リビジョン以後のリビジョンは存在しません。\n" +" このオプションは、同一ファイルシステム上での複製であっても、暗黙的に\n" +" --pull 指定を伴います。\n" +"\n" +" -U オプション指定時は、管理領域(.hg)の複製は行なわれますが、\n" +" 複製後の作業領域更新は行なわれません(親リビジョンが無い状態)。\n" +"\n" +" 有効な複製元指定形式は 'hg help urls' を参照してください。\n" +"\n" +" 複製先として ssh:// URL 形式を指定することも可能ですが、\n" +" .hg/hgrc および作業領域は遠隔ホストに作成されます。\n" +" ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" +" " + +msgid "" +"commit the specified files or all outstanding changes\n" +"\n" +" Commit changes to the given files into the repository.\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be committed.\n" +"\n" +" If you are committing the result of a merge, do not provide any\n" +" file names or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is started to\n" +" enter a message.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"変更内容のリポジトリへの記録(コミット)\n" +"\n" +" 指定されたファイルの変更内容をリポジトリに記録(コミット)します。\n" +"\n" +" ファイル指定が省略された場合、\"hg status\" により検出される全ての\n" +" 変更内容がコミットされます。\n" +"\n" +" \"hg merge\" 結果のコミットの場合、ファイル名ないし -I/-X オプションの\n" +" いずれも指定しないでください。\n" +"\n" +" コミットメッセージが指定されない場合、メッセージ入力のためのプログラム" +"が\n" +" 設定に従って起動されます。\n" +"\n" +" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" +" " + +msgid "created new head\n" +msgstr "" + +#, python-format +msgid "committed changeset %d:%s\n" +msgstr "" + +msgid "" +"mark files as copied for the next commit\n" +"\n" +" Mark dest as having copies of source files. If dest is a\n" +" directory, copies are put in that directory. If dest is a file,\n" +" there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a copy\n" +" before that, see hg revert.\n" +" " +msgstr "" +"指定されたファイルの複製\n" +"\n" +" 対象ファイルが複製元の複製であることを記録します。複製先指定が\n" +" ディレクトリの場合、ディレクトリ内に複製が作成されます。\n" +" 複製先指定がファイルの場合、複製元は1つしか指定できません。\n" +"\n" +" 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n" +" 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n" +" 操作は記録されますが、ファイルの複製は行われません。\n" +"\n" +" 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n" +" コミット前に複製操作を取り消す方法は hg revert を参照してください。\n" +" " + +msgid "find the ancestor revision of two revisions in a given index" +msgstr "" + +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "" + +msgid "either two or three arguments required" +msgstr "" + +msgid "returns the completion list associated with the given command" +msgstr "" + +msgid "rebuild the dirstate as it would look like for the given revision" +msgstr "" + +msgid "validate the correctness of the current dirstate" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but also in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in either manifest\n" +msgstr "" + +#, python-format +msgid "%s in manifest1, but listed as state %s" +msgstr "" + +msgid ".hg/dirstate inconsistent with current parent's manifest" +msgstr "" + +msgid "" +"show combined config settings from all hgrc files\n" +"\n" +" With no args, print names and values of all config items.\n" +"\n" +" With one arg of the form section.name, print just the value of\n" +" that config item.\n" +"\n" +" With multiple args, print names and values of all config items\n" +" with matching section names." +msgstr "" +"全設定ファイルによる最終的な設定内容の表示\n" +"\n" +" 引数指定が無い場合、全ての設定項目に対して、名前と値を表示します。\n" +"\n" +" section.name 形式に合致する引数を1つだけ指定した場合、その設定項目の\n" +" 値のみを表示します。\n" +"\n" +" 複数の引数が指定された場合、それらをセクション名とみなし、該当する\n" +" セクションの設定項目を全て表示します。" + +msgid "only one config item permitted" +msgstr "" + +msgid "" +"manually set the parents of the current working directory\n" +"\n" +" This is useful for writing repository conversion tools, but should\n" +" be used with care.\n" +" " +msgstr "" + +msgid "show the contents of the current dirstate" +msgstr "" + +#, python-format +msgid "copy: %s -> %s\n" +msgstr "" + +msgid "dump the contents of a data file revision" +msgstr "" + +#, python-format +msgid "invalid revision identifier %s" +msgstr "" + +msgid "parse and display a date" +msgstr "" + +msgid "dump the contents of an index file" +msgstr "" + +msgid "dump an index DAG as a .dot file" +msgstr "" + +msgid "test Mercurial installation" +msgstr "" + +#, python-format +msgid "Checking encoding (%s)...\n" +msgstr "" + +msgid " (check that your locale is properly set)\n" +msgstr "" + +msgid "Checking extensions...\n" +msgstr "" + +msgid " One or more extensions could not be found" +msgstr "" + +msgid " (check that you compiled the extensions)\n" +msgstr "" + +msgid "Checking templates...\n" +msgstr "" + +msgid " (templates seem to have been installed incorrectly)\n" +msgstr "" + +msgid "Checking patch...\n" +msgstr "" + +msgid " patch call failed:\n" +msgstr "" + +msgid " unexpected patch output!\n" +msgstr "" + +msgid " patch test failed!\n" +msgstr "" + +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://www.selenic." +"com/mercurial/bts\n" +msgstr "" + +msgid "Checking commit editor...\n" +msgstr "" + +msgid " No commit editor set and can't find vi in PATH\n" +msgstr "" + +msgid " (specify a commit editor in your .hgrc file)\n" +msgstr "" + +#, python-format +msgid " Can't find editor '%s' in PATH\n" +msgstr "" + +msgid "Checking username...\n" +msgstr "" + +msgid " (specify a username in your .hgrc file)\n" +msgstr "" + +msgid "No problems detected\n" +msgstr "" + +#, python-format +msgid "%s problems detected, please check your install!\n" +msgstr "" + +msgid "dump rename information" +msgstr "" + +#, python-format +msgid "%s renamed from %s:%s\n" +msgstr "" + +#, python-format +msgid "%s not renamed\n" +msgstr "" + +msgid "show how files match on given patterns" +msgstr "" + +msgid "" +"diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files.\n" +"\n" +" Differences between files are shown using the unified diff format.\n" +"\n" +" NOTE: diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first parent\n" +" changeset if no revisions are specified.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent.\n" +"\n" +" Without the -a option, diff will avoid generating diffs of files\n" +" it detects as binary. With -a, diff will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +" " +msgstr "" +"作業領域全体(ないし指定ファイル)の差分抽出\n" +"\n" +" 指定されたファイルに対して、リビジョン間の差分を表示します。\n" +"\n" +" 差分は unified diff 形式で表示されます。\n" +"\n" +" 備考: マージに対する差分表示が期待と異なる場合があるのは、\n" +" 無指定時に比較対象となるのが作業領域の第1親リビジョンであるためです。\n" +"\n" +" リビジョンが2つ指定された場合、両リビジョン間の差分が表示されます。\n" +" リビジョンが1つ指定された場合、当該リビジョンと作業領域の内容が比較\n" +" され、リビジョンが1つも指定されない場合は、作業領域の内容と\n" +" 親リビジョンとが比較されます。\n" +"\n" +" -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n" +" 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n" +" 全てのファイルに処理を実施します。\n" +"\n" +" git 拡張差分形式で表示するには --git オプションを指定します。\n" +" 詳細は \"hg help diffs\" を参照してください。\n" +" " + +msgid "" +"dump the header and diffs for one or more changesets\n" +"\n" +" Print the changeset header and diffs for one or more revisions.\n" +"\n" +" The information shown in the changeset header is: author,\n" +" changeset hash, parent(s) and commit comment.\n" +"\n" +" NOTE: export may generate unexpected diff output for merge changesets,\n" +" as it will compare the merge changeset against its first parent only.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are as follows:\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" +"\n" +" Without the -a option, export will avoid generating diffs of files\n" +" it detects as binary. With -a, export will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the second\n" +" parent. It can be useful to review a merge.\n" +" " +msgstr "" +"1つ以上のチェンジセットに対するヘッダおよび変更内容の出力\n" +"\n" +" 1つ以上のリビジョンに対して、ヘッダ情報および変更内容を表示します。\n" +"\n" +" ヘッダ情報には以下の情報が含まれます: \n" +" 作成者/ハッシュ値/親リビジョン/コミットログ\n" +"\n" +" 備考: 本コマンドがマージ実施チェンジセットに対して、期待と異なる差分を\n" +" 出力するのは、第1親との差分のみを出力するためです。\n" +"\n" +" (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n" +" 置換指定として以下のものが使用可能です:\n" +"\n" +" %% \"%\" 文字そのもの\n" +" %H ハッシュ値(40 桁 16 進数)\n" +" %N 生成されるファイルの総数\n" +" %R リビジョン番号\n" +" %b 対象リポジトリのベース名\n" +" %h 短縮形式ハッシュ値(12 桁 16 進数)\n" +" %n 1から始まるゼロ詰めの通し番号\n" +" %r ゼロ詰めのリビジョン番号\n" +"\n" +" -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n" +" 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n" +" 全てのファイルに処理を実施します。\n" +"\n" +" git 拡張差分形式で表示するには --git オプションを指定します。\n" +" 詳細は \"hg help diffs\" を参照してください。\n" +"\n" +" --switch-parent オプションを指定することで、比較対象が第2親になります。\n" +" これはマージのレビューの際などに有効です。\n" +" " + +msgid "export requires at least one changeset" +msgstr "" + +msgid "exporting patches:\n" +msgstr "" + +msgid "exporting patch:\n" +msgstr "" + +msgid "" +"search for a pattern in specified files and revisions\n" +"\n" +" Search revisions of files for a regular expression.\n" +"\n" +" This command behaves differently than Unix grep. It only accepts\n" +" Python/Perl regexps. It searches repository history, not the\n" +" working directory. It always prints the revision number in which\n" +" a match appears.\n" +"\n" +" By default, grep only prints output for the first revision of a\n" +" file in which it finds a match. To get it to print every revision\n" +" that contains a change in match status (\"-\" for a match that\n" +" becomes a non-match, or \"+\" for a non-match that becomes a match),\n" +" use the --all flag.\n" +" " +msgstr "" +"特定のパターンに合致するファイルとリビジョンの検索\n" +"\n" +" 正規表現に合致するファイルを含むリビジョンを検索します。\n" +"\n" +" 本コマンドの挙動は Unix の grep とは異なります。解釈可能な正規表現は\n" +" Python/Perl 形式のものだけです。検索対象はリポジトリ内のデータのみで、\n" +" 作業領域は検索対象には含まれません。パターンに合致する内容が現れた\n" +" リビジョンを表示します。\n" +"\n" +" 指定が無い場合本コマンドは、パターンに合致する内容が最小に現れた\n" +" リビジョンを各ファイル毎に表示します。パターンに合致する変更のあった\n" +" 全てのリビジョンを表示する場合、--all オプションを指定します\n" +" (パターン合致部分の削除は \"-\"、登場は \"+\" を表示することで区別)。\n" +" " + +#, python-format +msgid "grep: invalid match pattern: %s\n" +msgstr "" + +msgid "" +"show current repository heads or show branch heads\n" +"\n" +" With no arguments, show all repository head changesets.\n" +"\n" +" If branch or revisions names are given this will show the heads of\n" +" the specified branches or the branches those revisions are tagged\n" +" with.\n" +"\n" +" Repository \"heads\" are changesets that don't have child\n" +" changesets. They are where development generally takes place and\n" +" are the usual targets for update and merge operations.\n" +"\n" +" Branch heads are changesets that have a given branch tag, but have\n" +" no child changesets with that tag. They are usually where\n" +" development on the given branch takes place.\n" +" " +msgstr "" +"現時点でのリポジトリ(ないしブランチ)のヘッド表示\n" +"\n" +" 引数指定が無い場合、リポジトリ中の全てのヘッドを表示します。\n" +"\n" +" ブランチないしリビジョンが指定された場合本コマンドは、指定された\n" +" ブランチ、ないし指定リビジョンが属するブランチのヘッドを表示します。\n" +"\n" +" リポジトリの「ヘッド」とは、子チェンジセットを持たないチェンジセットの\n" +" ことを指します。改変作業の実施や、update/merge コマンド実施の際には\n" +" このチェンジセットを対象とするのが一般的です。\n" +"\n" +" ブランチのヘッドは、当該ブランチに属しつつ、そのブランチに属する\n" +" 子チェンジセットを持たないチェンジセットのことを指します。\n" +" 当該ブランチでの作業はこのチェンジセットを対象とするのが一般的です。\n" +" " + +#, python-format +msgid "no changes on branch %s containing %s are reachable from %s\n" +msgstr "" + +#, python-format +msgid "no changes on branch %s are reachable from %s\n" +msgstr "" + +msgid "" +"show help for a given topic or a help overview\n" +"\n" +" With no arguments, print a list of commands and short help.\n" +"\n" +" Given a topic, extension, or command name, print help for that topic." +msgstr "" +"指定されたトピックのヘルプやヘルプ概要の表示\n" +"\n" +" 引数指定が無い場合、コマンドの一覧と概要を表示します。\n" +"\n" +" トピックやコマンド名が指定された場合、指定対象のヘルプを表示します。" + +msgid "global options:" +msgstr "グローバルオプション:" + +msgid "use \"hg help\" for the full list of commands" +msgstr "全コマンドの一覧は \"hg help\" で表示されます" + +msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" +msgstr "" +"全コマンドの一覧は \"hg help\" で、コマンド詳細は \"hg -v\" で表示されます" + +#, python-format +msgid "use \"hg -v help%s\" to show aliases and global options" +msgstr "別名およびグローバルオプションは \"hg -v help%s\" で表示されます" + +#, python-format +msgid "use \"hg -v help %s\" to show global options" +msgstr "グローバルオプションは \"hg -v help %s\" で表示されます" + +msgid "" +"list of commands:\n" +"\n" +msgstr "" +"コマンド一覧:\n" +"\n" + +#, python-format +msgid "" +"\n" +"aliases: %s\n" +msgstr "" +"\n" +"別名: %s\n" + +msgid "(no help text available)" +msgstr "" + +msgid "options:\n" +msgstr "オプション:\n" + +msgid "no commands defined\n" +msgstr "" + +msgid "" +"\n" +"enabled extensions:\n" +"\n" +msgstr "" +"\n" +"利用可能な拡張機能:\n" +"\n" + +#, python-format +msgid " %s %s\n" +msgstr "" + +msgid "no help text available" +msgstr "" + +#, python-format +msgid "%s extension - %s\n" +msgstr "" + +msgid "Mercurial Distributed SCM\n" +msgstr "Mercurial - 分散構成管理ツール\n" + +msgid "" +"basic commands:\n" +"\n" +msgstr "" +"基本コマンド:\n" +"\n" + +msgid "" +"\n" +"additional help topics:\n" +"\n" +msgstr "" +"\n" +"追加のヘルプトピック:\n" +"\n" + +msgid "" +"identify the working copy or specified revision\n" +"\n" +" With no revision, print a summary of the current state of the repo.\n" +"\n" +" With a path, do a lookup in another repository.\n" +"\n" +" This summary identifies the repository state using one or two parent\n" +" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" +" in the working directory, a list of tags for this revision and a branch\n" +" name for non-default branches.\n" +" " +msgstr "" +"作業領域ないし特定リビジョンの識別情報表示\n" +"\n" +" リビジョン指定無しの起動では、作業領域の状態を表示します。\n" +"\n" +" パス指定有りでの起動の場合は、他のリポジトリを参照します。\n" +"\n" +" 本コマンドの出力する要約情報は、1つないし2つの親リビジョンのハッシュ値" +"を\n" +" 使用して、作業領域の状態を識別します。ハッシュ値の後ろには、作業領域に\n" +" 未コミットの変更がある場合は \"+\"、当該リビジョンに付いているタグの\n" +" 一覧、default 以外のブランチの場合にはブランチ名が続きます。\n" +" " + +msgid "" +"import an ordered set of patches\n" +"\n" +" Import a list of patches and commit them individually.\n" +"\n" +" If there are outstanding changes in the working directory, import\n" +" will abort unless given the -f flag.\n" +"\n" +" You can import a patch straight from a mail message. Even patches\n" +" as attachments work (body part must be type text/plain or\n" +" text/x-patch to be used). From and Subject headers of email\n" +" message are used as default committer and commit message. All\n" +" text/plain body parts before first diff are added to commit\n" +" message.\n" +"\n" +" If the imported patch was generated by hg export, user and description\n" +" from patch override values from message headers and body. Values\n" +" given on command line with -m and -u override these.\n" +"\n" +" If --exact is specified, import will set the working directory\n" +" to the parent of each patch before applying it, and will abort\n" +" if the resulting changeset has a different ID than the one\n" +" recorded in the patch. This may happen due to character set\n" +" problems or other deficiencies in the text patch format.\n" +"\n" +" With --similarity, hg will attempt to discover renames and copies\n" +" in the patch in the same way as 'addremove'.\n" +"\n" +" To read a patch from standard input, use patch name \"-\".\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"パッチの順次取り込み\n" +"\n" +" 列挙されたパッチの取り込みおよびコミットを個別に行います。\n" +"\n" +" 作業領域に未コミットの変更がある場合、-f フラグが指定されない限り\n" +" 取り込みは中断されます。\n" +"\n" +" 電子メールから直接パッチを取り込むことも可能です。添付ファイル形式の\n" +" パッチであっても取り込み可能です(text/plain ないし text/x-patch 型\n" +" でなければなりません)。電子メールの From および Subject ヘッダは\n" +" 無指定時の作成者およびコミットログとして使用されます。\n" +" 最初のパッチデータよりも前の text/plain 型ボディの内容は、\n" +" コミットログに対して追加されます。\n" +"\n" +" hg export により生成されたパッチを取り込む場合、電子メールのヘッダや\n" +" ボディ部分の情報よりも、パッチに含まれる情報の方が優先します。\n" +" コマンドラインでの -m ないし -u 指定は、これらよりも優先します。\n" +"\n" +" --exact が指定された際には、作業領域をそれぞれのパッチの親リビジョンで\n" +" 更新してからパッチの適用を実施しますが、作成されたチェンジセットのIDが\n" +" パッチに記録された ID と異なる場合、パッチの適用を中断します。\n" +" この中断は、利用する文字符号化の問題や、パッチのテキスト部分の不足\n" +" といったことが原因で発生する可能性もあります。\n" +"\n" +" --similarity が指定された際には、パッチによる変更における改名や複製を\n" +" hg addremove と同様な方針で特定します。\n" +"\n" +" 標準入力からパッチを取り込むには、パッチ名に \"-\" を指定してください。\n" +" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" +" " + +msgid "applying patch from stdin\n" +msgstr "" + +msgid "no diffs found" +msgstr "" + +#, python-format +msgid "" +"message:\n" +"%s\n" +msgstr "" + +msgid "not a mercurial patch" +msgstr "" + +msgid "patch is damaged or loses information" +msgstr "" + +msgid "" +"show new changesets found in source\n" +"\n" +" Show new changesets found in the specified path/URL or the default\n" +" pull location. These are the changesets that would be pulled if a pull\n" +" was requested.\n" +"\n" +" For remote repository, using --bundle avoids downloading the changesets\n" +" twice if the incoming is followed by a pull.\n" +"\n" +" See pull for valid source format details.\n" +" " +msgstr "" +"指定リポジトリ中の未取り込みチェンジセットの検索\n" +"\n" +" ファイルパスや URL、hg pull の default 取り込み対象により指定される\n" +" リポジトリ中の、未取り込みチェンジセットを検索します。\n" +" これらは、hg pull を実行した際に取り込まれる予定のチェンジセットです。\n" +"\n" +" 遠隔ホストのリポジトリの場合、--bundle を使用することで、本コマンド\n" +" 実行後の hg pull 実施の際に、再度のチェンジセット検索を抑止できます。\n" +"\n" +" 対象リポジトリの指定形式の詳細は hg pull のヘルプを参照してください。\n" +" " + +msgid "" +"create a new repository in the given directory\n" +"\n" +" Initialize a new repository in the given directory. If the given\n" +" directory does not exist, it is created.\n" +"\n" +" If no directory is given, the current directory is used.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" +"指定されたディレクトリでの新規リポジトリの作成\n" +"\n" +" 指定されたリポジトリを新規リポジトリとして初期化します。指定された\n" +" ディレクトリが存在しない場合には、ディレクトリを作成します。\n" +"\n" +" ディレクトリが指定されない場合、現ディレクトリが初期化されます。\n" +"\n" +" 複製先として ssh:// URL 形式を指定することも可能です。\n" +" 詳細に関しては、'hg help urls' を参照してください。\n" +" " + +msgid "" +"locate files matching specific patterns\n" +"\n" +" Print all files under Mercurial control whose names match the\n" +" given patterns.\n" +"\n" +" This command searches the entire repository by default. To search\n" +" just the current directory and its subdirectories, use\n" +" \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints all file\n" +" names.\n" +"\n" +" If you want to feed the output of this command into the \"xargs\"\n" +" command, use the \"-0\" option to both this command and \"xargs\".\n" +" This will avoid the problem of \"xargs\" treating single filenames\n" +" that contain white space as multiple filenames.\n" +" " +msgstr "" +"指定されたパターンに合致する名前を持つファイルの特定\n" +"\n" +" 構成管理対象となるファイルの中から、指定されたパターンに合致する名前を\n" +" 持つファイルを特定します。\n" +"\n" +" 特に指定が無い場合、本コマンドは構成管理対象となる作業領域中の\n" +" 全ファイルを検索対象とします。現ディレクトリとそのサブディレクトリのみ" +"を\n" +" 検索対象とするには、\"--include .\" を使用してください。\n" +"\n" +" パターン指定が無い場合、本コマンドは全ファイルのファイル名を表示しま" +"す。\n" +"\n" +" 本コマンドの出力を \"xargs\" コマンドへと渡す場合、本コマンドと\n" +" \"xargs\" コマンドの両方への \"-0\" オプション指定をお勧めします。\n" +" 空白文字を含む単一のファイル名が、複数のファイル名に解釈されてしまう\n" +" \"xargs\" の問題は、このオプションにより解決することができます。\n" +" " + +msgid "" +"show revision history of entire repository or files\n" +"\n" +" Print the revision history of the specified files or the entire\n" +" project.\n" +"\n" +" File history is shown without following rename or copy history of\n" +" files. Use -f/--follow with a file name to follow history across\n" +" renames and copies. --follow without a file name will only show\n" +" ancestors or descendants of the starting revision. --follow-first\n" +" only follows the first parent of merge revisions.\n" +"\n" +" If no revision range is specified, the default is tip:0 unless\n" +" --follow is set, in which case the working directory parent is\n" +" used as the starting revision.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" By default this command outputs: changeset id and hash, tags,\n" +" non-trivial parents, user, date and time, and a summary for each\n" +" commit. When the -v/--verbose switch is used, the list of changed\n" +" files and full commit message is shown.\n" +"\n" +" NOTE: log -p may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only. Also, the files: list will only reflect files\n" +" that are different from BOTH parents.\n" +"\n" +" " +msgstr "" +"リポジトリ全体ないしファイルの変更履歴の表示\n" +"\n" +" 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" +"\n" +" ファイルの履歴表示では、改名や複製における元ファイルにまでさかのぼった\n" +" 履歴は表示しません。元ファイルの履歴までさかのぼる場合には、ファイル名" +"と\n" +" 一緒に -f/--follow オプションを指定してください。--follow 指定の際に\n" +" ファイル名を指定しない場合は、開始リビジョンの先祖ないし子孫のリビジョ" +"ン\n" +" のみを表示します。--follow-first 指定は、マージリビジョンにおいて\n" +" 第1親の履歴のみをさかのぼります。\n" +"\n" +" 対象リビジョンの範囲が指定されない場合、対象となるリビジョンの範囲は\n" +" tip:0 とみなされますが、--follow が指定された場合は、作業領域の\n" +" 親リビジョンが開始リビジョンとみなされます。\n" +"\n" +" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" +"\n" +" 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" +" リビジョン番号、ハッシュID、タグ、(リビジョン番号の離れた)親リビジョ" +"ン、\n" +" 作成者、作成日時およびコミットログの1行目。\n" +" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミットログの\n" +" 全文が表示されます。\n" +"\n" +" 備考: -p オプションがマージチェンジセットに対して予期せぬ差分を出力\n" +" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期せぬ\n" +" 内容となるのは、両方の親と異なるファイルのみが列挙されるためです。\n" +"\n" +" " + +msgid "" +"looks up all renames for a file (up to endrev) the first\n" +" time the file is given. It indexes on the changerev and only\n" +" parses the manifest if linkrev != changerev.\n" +" Returns rename info for fn at changerev rev." +msgstr "" + +msgid "" +"output the current or given revision of the project manifest\n" +"\n" +" Print a list of version controlled files for the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" The manifest is the list of files being version controlled. If no " +"revision\n" +" is given then the first parent of the working directory is used.\n" +"\n" +" With -v flag, print file permissions, symlink and executable bits. With\n" +" --debug flag, print file revision hashes.\n" +" " +msgstr "" +"現時点ないし指定時点でのリポジトリマニフェストの出力\n" +"\n" +" 指定リビジョンでの構成管理対象ファイルの一覧を表示します。\n" +" リビジョン指定が無い場合、作業領域の(第1)親リビジョンか、\n" +" 作業領域の更新前なら tip が使用されます。\n" +"\n" +" 「マニフェスト」とは、構成管理対象ファイルの一覧を指します。\n" +"\n" +" -v が指定された場合、ファイルアクセス権やシンボリックリンク、\n" +" 実行可能ビットといったものも表示されます。\n" +" --debug が指定された場合、リビジョンのハッシュ値が表示されます。\n" +" " + +msgid "" +"merge working directory with another revision\n" +"\n" +" Merge the contents of the current working directory and the\n" +" requested revision. Files that changed between either parent are\n" +" marked as changed for the next commit and a commit must be\n" +" performed before any further updates are allowed.\n" +"\n" +" If no revision is specified, the working directory's parent is a\n" +" head revision, and the current branch contains exactly one other head,\n" +" the other head is merged with by default. Otherwise, an explicit\n" +" revision to merge with must be provided.\n" +" " +msgstr "" +"作業領域の内容と他のリビジョンのマージ\n" +"\n" +" 現時点での作業領域の内容を、指定されたリビジョンとマージします。\n" +" 両方の親リビジョンに対して変更のあるファイルは、次回コミットの際には\n" +" 更新として記録されますので、それ以上の変更が実施される前に\n" +" コミットを実施してください。\n" +"\n" +" マージ対象リビジョンの指定が無く、作業領域の親リビジョンがヘッドで、\n" +" 且つ現行ブランチがもう1つだけヘッドを持つ場合、そのヘッドがマージ対象\n" +" となります。それ以外の場合は、明示的なリビジョン指定が必要です。\n" +" " + +#, python-format +msgid "branch '%s' has %d heads - please merge with an explicit rev" +msgstr "" + +#, python-format +msgid "branch '%s' has one head - please merge with an explicit rev" +msgstr "" + +msgid "there is nothing to merge" +msgstr "" + +#, python-format +msgid "%s - use \"hg update\" instead" +msgstr "" + +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" +msgstr "" + +msgid "" +"show changesets not found in destination\n" +"\n" +" Show changesets not found in the specified destination repository or\n" +" the default push location. These are the changesets that would be " +"pushed\n" +" if a push was requested.\n" +"\n" +" See pull for valid destination format details.\n" +" " +msgstr "" +"連携先リポジトリに含まれないチェンジセットの表示\n" +"\n" +" 指定された連携先リポジトリ(ないし、無指定時の hg push 先リポジトリ)に\n" +" 含まれないチェンジセットを表示します。ここで表示されるチェンジセットは\n" +" hg push 実施の際に、連携先リポジトリへと反映されるチェンジセットです。\n" +"\n" +" 指定可能なリポジトリ指定形式は hg pull のヘルプを参照してください。\n" +" " + +msgid "" +"show the parents of the working dir or revision\n" +"\n" +" Print the working directory's parent revisions. If a\n" +" revision is given via --rev, the parent of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (before the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" +"作業領域(ないし指定リビジョン)の親リビジョンの表示\n" +"\n" +" 作業領域の親リビジョンを表示します。--rev でのリビジョン指定がある場合\n" +" 指定リビジョンの親リビジョンを表示します。ファイルが指定された場合、\n" +" (作業領域の親リビジョン、ないし --rev による指定リビジョン以前のもので)\n" +" そのファイルを最後に更新したリビジョンを表示します。\n" +" " + +msgid "can only specify an explicit file name" +msgstr "" + +#, python-format +msgid "'%s' not found in manifest!" +msgstr "" + +msgid "" +"show aliases for remote repositories\n" +"\n" +" Show definition of symbolic path name NAME. If no name is given, show\n" +" definition of available names.\n" +"\n" +" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" +"\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" +"連携先リポジトリの別名一覧の表示\n" +"\n" +" 指定されたシンボル名に相当する連携先リポジトリを表示します。\n" +" シンボル名が指定されない場合、全ての別名定義が表示されます。\n" +"\n" +" シンボル定義は、/etc/mercurial/hgrc および $HOME/.hgrc 等の [paths]\n" +" セクションに記述されます。作業領域での実行の場合は .hg/hgrc にも記述\n" +" 可能です。\n" +"\n" +" 詳細は 'hg help urls' を参照してください。\n" +" " + +msgid "not found!\n" +msgstr "" + +msgid "not updating, since new heads added\n" +msgstr "" + +msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" +msgstr "" + +msgid "(run 'hg update' to get a working copy)\n" +msgstr "" + +msgid "" +"pull changes from the specified source\n" +"\n" +" Pull changes from a remote repository to a local one.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository. By default, this\n" +" does not update the copy of the project in the working directory.\n" +"\n" +" If SOURCE is omitted, the 'default' path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" +"指定されたリポジトリからのチェンジセット取り込み\n" +"\n" +" 連携先リポジトリからローカルリポジトリにチェンジセットを取り込みます。\n" +"\n" +" パスや URL で指定される連携先リポジトリ中の、全てのチェンジセットが\n" +" 取り込み対象となります。指定が無い場合、このコマンドを実行しても\n" +" 作業領域の内容は更新されません。\n" +"\n" +" 連携先が省略された場合、'default' パスが連携先として使用されます。\n" +" 詳細は 'hg help urls' を参照してください。\n" +" " + +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" + +msgid "" +"push changes to the specified destination\n" +"\n" +" Push changes from the local repository to the given destination.\n" +"\n" +" This is the symmetrical operation for pull. It helps to move\n" +" changes from the current repository to a different one. If the\n" +" destination is local this is identical to a pull in that directory\n" +" from the current one.\n" +"\n" +" By default, push will refuse to run if it detects the result would\n" +" increase the number of remote heads. This generally indicates the\n" +" the client has forgotten to pull and merge before pushing.\n" +"\n" +" If -r is used, the named changeset and all its ancestors will be pushed\n" +" to the remote repository.\n" +"\n" +" Look at the help text for urls for important details about ssh:// URLs.\n" +" If DESTINATION is omitted, a default path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" +"指定されたリポジトリへのチェンジセット反映\n" +"\n" +" ローカルリポジトリから連携先リポジトリへとチェンジセットを反映します。\n" +"\n" +" これは hg pull と対称的な操作です。現在のリポジトリから連携先へと、\n" +" チェンジセットを簡単に移動させることができます。連携先リポジトリが\n" +" 同一ホスト上にある場合は、現リポジトリに対する連携先リポジトリでの\n" +" hg pull 実行と同一の効果を持ちます。\n" +"\n" +" 通常は、連携先リポジトリにヘッドが増える実行は拒絶されます。\n" +" このような場合、大概は hg push 前の hg pull および hg merge 実行を\n" +" 忘れていることが殆どです。\n" +"\n" +" -r が指定された場合、指定されたチェンジセットとその祖先が連携先\n" +" リポジトリへと反映されます。\n" +"\n" +" ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" +" 連携先が省略された場合、'default' パスが連携先として使用されます。\n" +" 詳細に関しては、'hg help urls' を参照してください。\n" +" " + +#, python-format +msgid "pushing to %s\n" +msgstr "" + +msgid "" +"raw commit interface (DEPRECATED)\n" +"\n" +" (DEPRECATED)\n" +" Lowlevel commit, for use in helper scripts.\n" +"\n" +" This command is not intended to be used by normal users, as it is\n" +" primarily useful for importing from other SCMs.\n" +"\n" +" This command is now deprecated and will be removed in a future\n" +" release, please use debugsetparents and commit instead.\n" +" " +msgstr "" + +msgid "(the rawcommit command is deprecated)\n" +msgstr "" + +msgid "" +"roll back an interrupted transaction\n" +"\n" +" Recover from an interrupted commit or pull.\n" +"\n" +" This command tries to fix the repository status after an interrupted\n" +" operation. It should only be necessary when Mercurial suggests it.\n" +" " +msgstr "" +"中断されたトランザクションの取り消し\n" +"\n" +" commit や pull が中断された場合の復旧を行います。\n" +"\n" +" 本コマンドは、操作が中断された際のリポジトリ状態の修復を行います。\n" +" 本コマンドの実行は、Mercurial が実行を促した場合のみで十分です。\n" +" " + +msgid "" +"remove the specified files on the next commit\n" +"\n" +" Schedule the indicated files for removal from the repository.\n" +"\n" +" This only removes files from the current branch, not from the entire\n" +" project history. -A can be used to remove only files that have already\n" +" been deleted, -f can be used to force deletion, and -Af can be used\n" +" to remove files from the next revision without deleting them.\n" +"\n" +" The following table details the behavior of remove for different file\n" +" states (columns) and option combinations (rows). The file states are\n" +" Added, Clean, Modified and Missing (as reported by hg status). The\n" +" actions are Warn, Remove (from branch) and Delete (from disk).\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" +"\n" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" +"次回コミットにおける指定されたファイルの登録除外\n" +"\n" +" 構成管理対象からの除外を予約します。\n" +"\n" +" この操作による登録除外の対称は現行ブランチのみで、他ブランチにおいては\n" +" ファイルは存続し続けます。手動で削除したファイルの登録除外には -A、\n" +" 強制的な登録除外には -f、作業領域中のファイルを削除することなく登録解除\n" +" するには -Af 指定が有効です。\n" +"\n" +" ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動の一覧を\n" +" 以下に示します。ファイルの状態は、hg status が表示する A(Add:追加)、\n" +" C(Clean:改変無し)、M(Modified:改変有り)および !(不明)で表します。\n" +" 挙動は W(Warn:警告)、R(Remove:構成管理からの登録除外)および\n" +" D(Delete:作業領域からの削除)で表します。\n" +"\n" +" A C M !\n" +" 無指定 W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" +"\n" +" 指定されたファイルは次回のコミットの際に登録が除外されます。\n" +" コミット前に登録解除を取り消す方法は、hg revert を参照してください。\n" +" " + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file %s (use -f to force removal)\n" +msgstr "" + +msgid "still exists" +msgstr "" + +msgid "is modified" +msgstr "" + +msgid "has been marked for add" +msgstr "" + +msgid "" +"rename files; equivalent of copy + remove\n" +"\n" +" Mark dest as copies of sources; mark sources for deletion. If\n" +" dest is a directory, copies are put in that directory. If dest is\n" +" a file, there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a rename\n" +" before that, see hg revert.\n" +" " +msgstr "" +"ファイルの改名(copy + remove と等価)\n" +"\n" +" 複製先ファイルを、複製元の複製であると記録し、複製元を登録解除します。\n" +" 複製先指定がディレクトリの場合、ディレクトリ内に複製が作成されます。\n" +" 複製先指定がファイルの場合、複製元は1つしか指定できません。\n" +"\n" +" 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n" +" 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n" +" 操作は記録されますが、ファイルの複製は行われません。\n" +"\n" +" 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n" +" コミット前に改名操作を取り消す方法は hg revert を参照してください。\n" +" " + +msgid "" +"retry file merges from a merge or update\n" +"\n" +" This command will cleanly retry unresolved file merges using file\n" +" revisions preserved from the last update or merge. To attempt to\n" +" resolve all unresolved files, use the -a switch.\n" +"\n" +" This command will also allow listing resolved files and manually\n" +" marking and unmarking files as resolved.\n" +"\n" +" The codes used to show the status of files are:\n" +" U = unresolved\n" +" R = resolved\n" +" " +msgstr "" +"hg merge や hg update におけるファイルマージの再実施\n" +"\n" +" 直前の hg merge や hg update の際に保存されたファイルの内容を用いた\n" +" 綺麗な状態でのマージを、衝突未解消のファイルに対して実施します。\n" +" 全ての衝突未解消ファイルを実施対象にする場合は、-a オプションを指定\n" +" してください。\n" +"\n" +" 本コマンドは、ファイルの衝突解消状態の一覧表示や、解消済み・未解消の\n" +" 状態区分の手動指定をすることもできます。\n" +"\n" +" ファイルの衝突解消状態表示には以下の記号が使用されます:\n" +" U = 未解消\n" +" R = 解消済み\n" +" " + +msgid "too many options specified" +msgstr "" + +msgid "can't specify --all and patterns" +msgstr "" + +msgid "no files or directories specified; use --all to remerge all files" +msgstr "" + +msgid "" +"restore individual files or dirs to an earlier state\n" +"\n" +" (use update -r to check out earlier revisions, revert does not\n" +" change the working dir parents)\n" +"\n" +" With no revision specified, revert the named files or directories\n" +" to the contents they had in the parent of the working directory.\n" +" This restores the contents of the affected files to an unmodified\n" +" state and unschedules adds, removes, copies, and renames. If the\n" +" working directory has two parents, you must explicitly specify the\n" +" revision to revert to.\n" +"\n" +" Using the -r option, revert the given files or directories to their\n" +" contents as of a specific revision. This can be helpful to \"roll\n" +" back\" some or all of an earlier change.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" Revert modifies the working directory. It does not commit any\n" +" changes, or change the parent of the working directory. If you\n" +" revert to a revision other than the parent of the working\n" +" directory, the reverted files will thus appear modified\n" +" afterwards.\n" +"\n" +" If a file has been deleted, it is restored. If the executable\n" +" mode of a file was changed, it is reset.\n" +"\n" +" If names are given, all files matching the names are reverted.\n" +" If no arguments are given, no files are reverted.\n" +"\n" +" Modified files are saved with a .orig suffix before reverting.\n" +" To disable these backups, use --no-backup.\n" +" " +msgstr "" +"各ファイル／ディレクトリ状態の復旧\n" +"\n" +" (hg revert は作業領域の親リビジョンを変更しないので、作業領域の状態を\n" +" 以前の版に戻す場合は、hg update を使用してください)\n" +"\n" +" リビジョン指定が無い場合、指定されたファイル／ディレクトリを作業領域の\n" +" 親リビジョン時点の内容へと復旧します。\n" +" 本コマンドは対象となるファイルに対して、状態を「改変無し」とし、\n" +" add/remove/copy/rename による次回コミット向けの操作予約を取り消します。\n" +" 作業領域の親リビジョンが2つある場合、どちらの内容で復旧するのかを\n" +" 明示的に指定する必要があります。\n" +"\n" +" -r オプションが指定された場合、指定されたファイル／ディレクトリを、\n" +" 指定されたリビジョン時点の内容へと復旧します。以前の変更内容の一部、\n" +" ないし全部を取り消す用途にも使用できます。\n" +" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" +"\n" +" 本コマンドは作業領域の内容を変更しますが、変更のコミットや、作業領域の\n" +" 親リビジョンの変更は行いません。そのため、作業領域の親リビジョン以外の\n" +" リビジョンを指定して復旧した場合、復旧後のファイルの状態は「改変有り」\n" +" となります。\n" +"\n" +" ファイルが削除されていた場合、ファイルは復旧されます。実行権限ビットが\n" +" 変更されていた場合、変更前の状態に復旧されます。\n" +"\n" +" 復旧対象が指定された場合、指定された名前に合致する全てのファイルが復旧\n" +" 対象となります。復旧対象が指定されなかった場合は、いずれのファイルも\n" +" 復旧されません。\n" +"\n" +" 改変されたファイルの復旧の際には、復旧前の内容が .orig 拡張子が付いた\n" +" ファイルに保存されます。この保存は --no-backup 指定で無効化可能です。\n" +" " + +msgid "you can't specify a revision and a date" +msgstr "" + +msgid "no files or directories specified; use --all to revert the whole repo" +msgstr "" + +#, python-format +msgid "forgetting %s\n" +msgstr "" + +#, python-format +msgid "reverting %s\n" +msgstr "" + +#, python-format +msgid "undeleting %s\n" +msgstr "" + +#, python-format +msgid "saving current version of %s as %s\n" +msgstr "" + +#, python-format +msgid "file not managed: %s\n" +msgstr "" + +#, python-format +msgid "no changes needed to %s\n" +msgstr "" + +msgid "" +"roll back the last transaction\n" +"\n" +" This command should be used with care. There is only one level of\n" +" rollback, and there is no way to undo a rollback. It will also\n" +" restore the dirstate at the time of the last transaction, losing\n" +" any dirstate changes since that time.\n" +"\n" +" Transactions are used to encapsulate the effects of all commands\n" +" that create new changesets or propagate existing changesets into a\n" +" repository. For example, the following commands are transactional,\n" +" and their effects can be rolled back:\n" +"\n" +" commit\n" +" import\n" +" pull\n" +" push (with this repository as destination)\n" +" unbundle\n" +"\n" +" This command is not intended for use on public repositories. Once\n" +" changes are visible for pull by other users, rolling a transaction\n" +" back locally is ineffective (someone else may already have pulled\n" +" the changes). Furthermore, a race is possible with readers of the\n" +" repository; for example an in-progress pull from the repository\n" +" may fail if a rollback is performed.\n" +" " +msgstr "" +"直前のトランザクションの巻き戻し\n" +"\n" +" 本コマンドの使用に当たっては注意が必要です。巻き戻しは１段階限りで、\n" +" 巻き戻したトランザクションの再実施はできません。本コマンドは、\n" +" 直前のトランザクション実施時点の dirstate を復元し、その時点以後の\n" +" 変更は全て失われます。\n" +"\n" +" トランザクションとは、新規チェンジセットの作成、ないし外部からの既存\n" +" チェンジセットの取り込みに要するコマンドの効果を一括化するものです。\n" +" 例えば、以下のコマンドはいずれもトランザクションを形成するもので、\n" +" その効果は巻き戻し可能です。\n" +"\n" +" commit\n" +" import\n" +" pull\n" +" push (rollback 可能なのは反映先リポジトリ側)\n" +" unbundle\n" +"\n" +" 本コマンドは、公開リポジトリでの実行を想定していません。\n" +" 他のユーザに対して一旦 pull 可能な状態になってしまったなら、\n" +" 公開リポジトリでの rollback は(既に他のユーザによって取り込まれている\n" +" 可能性があるので)効果を持ちません。\n" +" その上、リポジトリからの情報読み取りに際して、競合が発生し得ます。\n" +" 例えば、巻き戻し操作によって、進行中のリポジトリからの取り込みが\n" +" 失敗してしまう可能性があります。\n" +" " + +msgid "" +"print the root (top) of the current working dir\n" +"\n" +" Print the root directory of the current repository.\n" +" " +msgstr "" +"作業領域のルート(最上位)ディレクトリ位置の表示\n" +"\n" +" 作業領域のルートディレクトリ位置を表示します。\n" +" " + +msgid "" +"export the repository via HTTP\n" +"\n" +" Start a local HTTP repository browser and pull server.\n" +"\n" +" By default, the server logs accesses to stdout and errors to\n" +" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" " +msgstr "" +"HTTP 経由でのリポジトリの公開\n" +"\n" +" HTTP 経由でのリポジトリ参照と hg pull を可能にするサーバを起動します。\n" +"\n" +" 特に指定が無い場合、サーバはアクセスログを標準出力へ、エラーは標準\n" +" エラー出力に出力します。ログをファイルに記録する場合は、\"-A\" や \n" +" \"-E\" オプションを使用してください。\n" +" " + +#, python-format +msgid "listening at http://%s%s/%s (bound to %s:%d)\n" +msgstr "" + +msgid "" +"show changed files in the working directory\n" +"\n" +" Show status of files in the repository. If names are given, only\n" +" files that match are shown. Files that are clean or ignored or\n" +" source of a copy/move operation, are not listed unless -c (clean),\n" +" -i (ignored), -C (copies) or -A is given. Unless options described\n" +" with \"show only ...\" are given, the options -mardu are used.\n" +"\n" +" Option -q/--quiet hides untracked (unknown and ignored) files\n" +" unless explicitly requested with -u/--unknown or -i/-ignored.\n" +"\n" +" NOTE: status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does not\n" +" report permission changes and diff only reports changes relative\n" +" to one merge parent.\n" +"\n" +" If one revision is given, it is used as the base revision.\n" +" If two revisions are given, the difference between them is shown.\n" +"\n" +" The codes used to show the status of files are:\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = deleted, but still tracked\n" +" ? = not tracked\n" +" I = ignored\n" +" = the previous added file was copied from here\n" +" " +msgstr "" +"作業領域のファイル操作状況の表示\n" +"\n" +" 作業領域のファイル状態を表示します。名前(パターン)が指定された場合、\n" +" その名前に合致するファイルのみが表示されます。改変無し(clean)、\n" +" 無視(ignored)ないし複製(copy)・改名(rename)の元ファイルに関しては、\n" +" それぞれ -c (clean)、-i (ignored) ないし -C (copy) が指定されるか、\n" +" -A(all) が指定されない限り表示されません。表示対象選択のオプションが\n" +" 何も指定されない場合、-m -a -r -d -u が指定されたものとして動作します。\n" +"\n" +" -q/--quiet オプション指定がある場合、明示的に -u/--unknown ないし\n" +" -i/-ignored が指定されない限り、構成管理対象外(unknown と ignored)\n" +" のファイルを表示対象外とします。\n" +"\n" +" 備考:権限設定の変更やマージが行われた場合、差分表示から期待される結果\n" +" とは異なる状態が表示される可能性があります。標準的な差分出力形式は、\n" +" 権限変更の情報を含みませんし、マージにおける一方の親リビジョンとの\n" +" 差分しか表示しません。\n" +"\n" +" 1つのリビジョンが指定された場合、比較元リビジョンとして扱われます。\n" +" 2つのリビジョンが指定された場合、両リビジョンの間で状態が比較されます。\n" +"\n" +" ファイルの状態を表す記号は以下の通り:\n" +" M = 改変有り(modified)\n" +" A = 新規登録(added)\n" +" R = 登録解除(removed)\n" +" C = 改変無し(clean)\n" +" ! = 作業領域にファイルが無い(missing)\n" +" ? = 構成管理対象外(unknown)\n" +" I = 無視(ignored)\n" +" = 直前に表示される新規登録ファイルの複製元\n" +" " + +msgid "" +"add one or more tags for the current or given revision\n" +"\n" +" Name a particular revision using <name>.\n" +"\n" +" Tags are used to name particular revisions of the repository and are\n" +" very useful to compare different revisions, to go back to significant\n" +" earlier versions or to mark branch points as releases, etc.\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" To facilitate version control, distribution, and merging of tags,\n" +" they are stored as a file named \".hgtags\" which is managed\n" +" similarly to other project files and can be hand-edited if\n" +" necessary. The file '.hg/localtags' is used for local tags (not\n" +" shared among repositories).\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"現リビジョンないし指定リビジョンへのタグの付与\n" +"\n" +" 特定のリビジョンに、指定された名前を付けます。\n" +"\n" +" リポジトリ中の特定のリビジョンに付けられた名前であるタグは、リビジョン\n" +" 間での比較や、重要なリビジョンの参照、又はリリースの際の分岐点に対する\n" +" 目印といった用途などに使用することが出来ます。\n" +"\n" +" リビジョンが指定されない場合、作業領域の親リビジョンか、作業領域更新前\n" +" なら tip がタグ付けの対象となります。\n" +"\n" +" 分散構成管理におけるタグ付けの集約を容易にするために、構成管理下にある\n" +" 他のファイルと同様に、タグの情報は \".hgtags\" ファイルで管理され、\n" +" 必要であれば手動での編集も可能です。ローカルタグは '.hg/localtags' で\n" +" 管理されます(リポジトリ間で共有されることはありません)\n" +"\n" +" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" +" " + +msgid "tag names must be unique" +msgstr "" + +#, python-format +msgid "the name '%s' is reserved" +msgstr "" + +msgid "--rev and --remove are incompatible" +msgstr "" + +#, python-format +msgid "tag '%s' does not exist" +msgstr "" + +#, python-format +msgid "tag '%s' is not a %s tag" +msgstr "" + +#, python-format +msgid "Removed tag %s" +msgstr "" + +#, python-format +msgid "tag '%s' already exists (use -f to force)" +msgstr "" + +#, python-format +msgid "Added tag %s for changeset %s" +msgstr "" + +msgid "" +"list repository tags\n" +"\n" +" This lists both regular and local tags. When the -v/--verbose switch\n" +" is used, a third column \"local\" is printed for local tags.\n" +" " +msgstr "" +"リポジトリ中のタグ一覧の表示\n" +"\n" +" 本コマンドは、通常のタグおよびローカルタグの両方を一覧表示します。\n" +" -v/--verbose オプションが指定された場合、ローカルタグの識別情報用に、\n" +" \"local\" カラムが追加表示されます。\n" +" " + +msgid "" +"show the tip revision\n" +"\n" +" The tip revision (usually just called the tip) is the most\n" +" recently added changeset in the repository, the most recently\n" +" changed head.\n" +"\n" +" If you have just made a commit, that commit will be the tip. If\n" +" you have just pulled changes from another repository, the tip of\n" +" that repository becomes the current tip. The \"tip\" tag is special\n" +" and cannot be renamed or assigned to a different changeset.\n" +" " +msgstr "" +"tip リビジョンの表示\n" +"\n" +" tip リビジョン(一般に tip と表記)とは、リポジトリおいて最も新しく追加\n" +" されたチェンジセットによるリビジョンであると同時に、最も新しく変更\n" +" されたヘッドのことでもあります。\n" +"\n" +" コミットした直後であれば、生成されたチェンジセットが tip となります。\n" +" 他のリポジトリからチェンジセットの取り込みをした直後であれば、取り込み\n" +" 対象リポジトリでの tip が現リポジトリの tip となります。\"tip\" タグは\n" +" 特別なタグで、改名や、他のリビジョンへの付け替えはできません。\n" +" " + +msgid "" +"apply one or more changegroup files\n" +"\n" +" Apply one or more compressed changegroup files generated by the\n" +" bundle command.\n" +" " +msgstr "" +"バンドルファイルの適用\n" +"\n" +" hg bundle コマンドで生成されたバンドルファイルを適用します。\n" +" " + +msgid "" +"update working directory\n" +"\n" +" Update the repository's working directory to the specified revision,\n" +" or the tip of the current branch if none is specified. Use null as\n" +" the revision to remove the working copy (like 'hg clone -U').\n" +"\n" +" When the working dir contains no uncommitted changes, it will be\n" +" replaced by the state of the requested revision from the repo. When\n" +" the requested revision is on a different branch, the working dir\n" +" will additionally be switched to that branch.\n" +"\n" +" When there are uncommitted changes, use option -C to discard them,\n" +" forcibly replacing the state of the working dir with the requested\n" +" revision.\n" +"\n" +" When there are uncommitted changes and option -C is not used, and\n" +" the parent revision and requested revision are on the same branch,\n" +" and one of them is an ancestor of the other, then the new working\n" +" directory will contain the requested revision merged with the\n" +" uncommitted changes. Otherwise, the update will fail with a\n" +" suggestion to use 'merge' or 'update -C' instead.\n" +"\n" +" If you want to update just one file to an older revision, use revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for --date.\n" +" " +msgstr "" +"作業領域の更新\n" +"\n" +" 指定されたリビジョン時点の内容で、作業領域を更新します。\n" +" リビジョン指定が無い場合は、現ブランチの最新リビジョンで更新します。\n" +" 作業領域中のファイルを削除する場合は、リビジョンに null を指定します\n" +" ('hg clone -U' と同様の状態になります)。\n" +"\n" +" 作業領域中に未コミットの変更が無い場合は、リポジトリに記録されている\n" +" 指定リビジョン時点の内容で、作業領域が更新されます。指定リビジョンが\n" +" 作業領域の親リビジョンと異なるブランチのものである場合、作業領域は\n" +" 別ブランチへと移行します。\n" +"\n" +" 未コミットの変更が有る場合、-C オプションを指定することで、変更内容を\n" +" 破棄し、指定リビジョン時点の内容で作業領域を強制的に更新します。\n" +"\n" +" 未コミットの変更が有り、且つ -C オプションが指定されなかった場合は、\n" +" 親リビジョンと指定リビジョンが同一ブランチに属し、且つお互いが直系の\n" +" 関係にある時に限り、未コミットの変更内容と指定リビジョンをマージした\n" +" 結果で作業領域が更新されます。それ以外の場合は、'merge' ないし \n" +" 'update -C' の使用を促した上で、コマンド実行は中断されます。\n" +"\n" +" 1つのファイルだけを以前の状態に戻す場合は revert を使用してください。\n" +"\n" +" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" +" " + +msgid "" +"verify the integrity of the repository\n" +"\n" +" Verify the integrity of the current repository.\n" +"\n" +" This will perform an extensive check of the repository's\n" +" integrity, validating the hashes and checksums of each entry in\n" +" the changelog, manifest, and tracked files, as well as the\n" +" integrity of their crosslinks and indices.\n" +" " +msgstr "" +"リポジトリの整合性検証\n" +"\n" +" 現リポジトリの整合性を検証します。\n" +"\n" +" 本コマンドは、リポジトリの整合性に関する広範な検証を行います。\n" +" 変更記録・マニフェスト・各構成管理対象ファイルにおけるハッシュ値および\n" +" チェックサム、相互関連付けおよびインデックス等の整合性が検証されます。\n" +" " + +msgid "output version and copyright information" +msgstr "バージョンおよび著作権情報の表示" + +#, python-format +msgid "Mercurial Distributed SCM (version %s)\n" +msgstr "Mercurial - 分散構成管理ツール(バージョン %s)\n" + +msgid "" +"\n" +"Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +msgid "repository root directory or symbolic path name" +msgstr "" + +msgid "change working directory" +msgstr "" + +msgid "do not prompt, assume 'yes' for any required answers" +msgstr "" + +msgid "suppress output" +msgstr "" + +msgid "enable additional output" +msgstr "" + +msgid "set/override config option" +msgstr "" + +msgid "enable debugging output" +msgstr "" + +msgid "start debugger" +msgstr "" + +msgid "set the charset encoding" +msgstr "" + +msgid "set the charset encoding mode" +msgstr "" + +msgid "print improved command execution profile" +msgstr "" + +msgid "print traceback on exception" +msgstr "" + +msgid "time how long the command takes" +msgstr "" + +msgid "print command execution profile" +msgstr "" + +msgid "output version information and exit" +msgstr "" + +msgid "display help and exit" +msgstr "" + +msgid "do not perform actions, just print output" +msgstr "" + +msgid "specify ssh command to use" +msgstr "" + +msgid "specify hg command to run on the remote side" +msgstr "" + +msgid "include names matching the given patterns" +msgstr "" + +msgid "exclude names matching the given patterns" +msgstr "" + +msgid "use <text> as commit message" +msgstr "" + +msgid "read commit message from <file>" +msgstr "" + +msgid "record datecode as commit date" +msgstr "" + +msgid "record user as committer" +msgstr "" + +msgid "display using template map file" +msgstr "" + +msgid "display with template" +msgstr "" + +msgid "do not show merges" +msgstr "" + +msgid "treat all files as text" +msgstr "" + +msgid "don't include dates in diff headers" +msgstr "" + +msgid "show which function each change is in" +msgstr "" + +msgid "ignore white space when comparing lines" +msgstr "" + +msgid "ignore changes in the amount of white space" +msgstr "" + +msgid "ignore changes whose lines are all blank" +msgstr "" + +msgid "number of lines of context to show" +msgstr "" + +msgid "guess renamed files by similarity (0<=s<=100)" +msgstr "" + +msgid "[OPTION]... [FILE]..." +msgstr "" + +msgid "annotate the specified revision" +msgstr "" + +msgid "follow file copies and renames" +msgstr "" + +msgid "list the author (long with -v)" +msgstr "" + +msgid "list the date (short with -q)" +msgstr "" + +msgid "list the revision number (default)" +msgstr "" + +msgid "list the changeset" +msgstr "" + +msgid "show line number at the first appearance" +msgstr "" + +msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." +msgstr "" + +msgid "do not pass files through decoders" +msgstr "" + +msgid "directory prefix for files in archive" +msgstr "" + +msgid "revision to distribute" +msgstr "" + +msgid "type of distribution to create" +msgstr "" + +msgid "[OPTION]... DEST" +msgstr "" + +msgid "merge with old dirstate parent after backout" +msgstr "" + +msgid "parent to choose when backing out merge" +msgstr "" + +msgid "revision to backout" +msgstr "" + +msgid "[OPTION]... [-r] REV" +msgstr "" + +msgid "reset bisect state" +msgstr "" + +msgid "mark changeset good" +msgstr "" + +msgid "mark changeset bad" +msgstr "" + +msgid "skip testing changeset" +msgstr "" + +msgid "use command to check changeset state" +msgstr "" + +msgid "do not update to target" +msgstr "" + +msgid "[-gbsr] [-c CMD] [REV]" +msgstr "" + +msgid "set branch name even if it shadows an existing branch" +msgstr "" + +msgid "reset branch name to parent branch name" +msgstr "" + +msgid "[-fC] [NAME]" +msgstr "" + +msgid "show only branches that have unmerged heads" +msgstr "" + +msgid "[-a]" +msgstr "" + +msgid "run even when remote repository is unrelated" +msgstr "" + +msgid "a changeset up to which you would like to bundle" +msgstr "" + +msgid "a base changeset to specify instead of a destination" +msgstr "" + +msgid "bundle all changesets in the repository" +msgstr "" + +msgid "bundle compression type to use" +msgstr "" + +msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "" + +msgid "print output to file with formatted name" +msgstr "" + +msgid "print the given revision" +msgstr "" + +msgid "apply any matching decode filter" +msgstr "" + +msgid "[OPTION]... FILE..." +msgstr "" + +msgid "the clone will only contain a repository (no working copy)" +msgstr "" + +msgid "a changeset you would like to have after cloning" +msgstr "" + +msgid "[OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "mark new/missing files as added/removed before committing" +msgstr "" + +msgid "mark a branch as closed, hiding it from the branch list" +msgstr "" + +msgid "record a copy that has already occurred" +msgstr "" + +msgid "forcibly copy over an existing managed file" +msgstr "" + +msgid "[OPTION]... [SOURCE]... DEST" +msgstr "" + +msgid "[INDEX] REV1 REV2" +msgstr "" + +msgid "show the command options" +msgstr "" + +msgid "[-o] CMD" +msgstr "" + +msgid "try extended date formats" +msgstr "" + +msgid "[-e] DATE [RANGE]" +msgstr "" + +msgid "FILE REV" +msgstr "" + +msgid "[PATH]" +msgstr "" + +msgid "FILE" +msgstr "" + +msgid "parent" +msgstr "" + +msgid "file list" +msgstr "" + +msgid "revision to rebuild to" +msgstr "" + +msgid "[-r REV] [REV]" +msgstr "" + +msgid "revision to debug" +msgstr "" + +msgid "[-r REV] FILE" +msgstr "" + +msgid "REV1 [REV2]" +msgstr "" + +msgid "do not display the saved mtime" +msgstr "" + +msgid "[OPTION]..." +msgstr "" + +msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." +msgstr "" + +msgid "diff against the second parent" +msgstr "" + +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "" + +msgid "end fields with NUL" +msgstr "" + +msgid "print all revisions that match" +msgstr "" + +msgid "follow changeset history, or file history across copies and renames" +msgstr "" + +msgid "ignore case when matching" +msgstr "" + +msgid "print only filenames and revs that match" +msgstr "" + +msgid "print matching line numbers" +msgstr "" + +msgid "search in given revision range" +msgstr "" + +msgid "[OPTION]... PATTERN [FILE]..." +msgstr "" + +msgid "show only heads which are descendants of rev" +msgstr "" + +msgid "show only the active heads from open branches" +msgstr "" + +msgid "[-r REV] [REV]..." +msgstr "" + +msgid "[TOPIC]" +msgstr "" + +msgid "identify the specified rev" +msgstr "" + +msgid "show local revision number" +msgstr "" + +msgid "show global revision id" +msgstr "" + +msgid "show branch" +msgstr "" + +msgid "show tags" +msgstr "" + +msgid "[-nibt] [-r REV] [SOURCE]" +msgstr "" + +msgid "" +"directory strip option for patch. This has the same\n" +"meaning as the corresponding patch option" +msgstr "" + +msgid "base path" +msgstr "" + +msgid "skip check for outstanding uncommitted changes" +msgstr "" + +msgid "don't commit, just update the working directory" +msgstr "" + +msgid "apply patch to the nodes from which it was generated" +msgstr "" + +msgid "Use any branch information in patch (implied by --exact)" +msgstr "" + +msgid "[OPTION]... PATCH..." +msgstr "" + +msgid "show newest record first" +msgstr "" + +msgid "file to store the bundles into" +msgstr "" + +msgid "a specific revision up to which you would like to pull" +msgstr "" + +msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" +msgstr "" + +msgid "[-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "search the repository as it stood at rev" +msgstr "" + +msgid "end filenames with NUL, for use with xargs" +msgstr "" + +msgid "print complete paths from the filesystem root" +msgstr "" + +msgid "[OPTION]... [PATTERN]..." +msgstr "" + +msgid "only follow the first parent of merge changesets" +msgstr "" + +msgid "show revs matching date spec" +msgstr "" + +msgid "show copied files" +msgstr "" + +msgid "do case-insensitive search for a keyword" +msgstr "" + +msgid "include revs where files were removed" +msgstr "" + +msgid "show only merges" +msgstr "" + +msgid "revs committed by user" +msgstr "" + +msgid "show only changesets within the given named branch" +msgstr "" + +msgid "do not display revision or any of its ancestors" +msgstr "" + +msgid "[OPTION]... [FILE]" +msgstr "" + +msgid "revision to display" +msgstr "" + +msgid "[-r REV]" +msgstr "" + +msgid "force a merge with outstanding changes" +msgstr "" + +msgid "revision to merge" +msgstr "" + +msgid "[-f] [[-r] REV]" +msgstr "" + +msgid "a specific revision up to which you would like to push" +msgstr "" + +msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" +msgstr "" + +msgid "show parents from the specified rev" +msgstr "" + +msgid "hg parents [-r REV] [FILE]" +msgstr "" + +msgid "[NAME]" +msgstr "" + +msgid "update to new tip if changesets were pulled" +msgstr "" + +msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "" + +msgid "force push" +msgstr "" + +msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "record delete for missing files" +msgstr "" + +msgid "remove (and delete) file even if added or modified" +msgstr "" + +msgid "record a rename that has already occurred" +msgstr "" + +msgid "[OPTION]... SOURCE... DEST" +msgstr "" + +msgid "remerge all unresolved files" +msgstr "" + +msgid "list state of files needing merge" +msgstr "" + +msgid "mark files as resolved" +msgstr "" + +msgid "unmark files as resolved" +msgstr "" + +msgid "revert all changes when no arguments given" +msgstr "" + +msgid "tipmost revision matching date" +msgstr "" + +msgid "revision to revert to" +msgstr "" + +msgid "do not save backup copies of files" +msgstr "" + +msgid "[OPTION]... [-r REV] [NAME]..." +msgstr "" + +msgid "name of access log file to write to" +msgstr "" + +msgid "name of error log file to write to" +msgstr "" + +msgid "port to listen on (default: 8000)" +msgstr "" + +msgid "address to listen on (default: all interfaces)" +msgstr "" + +msgid "prefix path to serve from (default: server root)" +msgstr "" + +msgid "name to show in web pages (default: working dir)" +msgstr "" + +msgid "name of the webdir config file (serve more than one repo)" +msgstr "" + +msgid "for remote clients" +msgstr "" + +msgid "web templates to use" +msgstr "" + +msgid "template style to use" +msgstr "" + +msgid "use IPv6 in addition to IPv4" +msgstr "" + +msgid "SSL certificate file" +msgstr "" + +msgid "show untrusted configuration options" +msgstr "" + +msgid "[-u] [NAME]..." +msgstr "" + +msgid "show status of all files" +msgstr "" + +msgid "show only modified files" +msgstr "" + +msgid "show only added files" +msgstr "" + +msgid "show only removed files" +msgstr "" + +msgid "show only deleted (but tracked) files" +msgstr "" + +msgid "show only files without changes" +msgstr "" + +msgid "show only unknown (not tracked) files" +msgstr "" + +msgid "show only ignored files" +msgstr "" + +msgid "hide status prefix" +msgstr "" + +msgid "show source of copied files" +msgstr "" + +msgid "show difference from revision" +msgstr "" + +msgid "replace existing tag" +msgstr "" + +msgid "make the tag local" +msgstr "" + +msgid "revision to tag" +msgstr "" + +msgid "remove a tag" +msgstr "" + +msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "" + +msgid "[-p]" +msgstr "" + +msgid "update to new tip if changesets were unbundled" +msgstr "" + +msgid "[-u] FILE..." +msgstr "" + +msgid "overwrite locally modified files (no backup)" +msgstr "" + +msgid "[-C] [-d DATE] [[-r] REV]" +msgstr "" + +msgid "not found in manifest" +msgstr "" + +msgid "branch name not in UTF-8!" +msgstr "" + +#, python-format +msgid " searching for copies back to rev %d\n" +msgstr "" + +#, python-format +msgid "" +" unmatched files in local:\n" +" %s\n" +msgstr "" + +#, python-format +msgid "" +" unmatched files in other:\n" +" %s\n" +msgstr "" + +msgid " all copies found (* = to merge, ! = divergent):\n" +msgstr "" + +#, python-format +msgid " %s -> %s %s\n" +msgstr "" + +msgid " checking for directory renames\n" +msgstr "" + +#, python-format +msgid " dir %s -> %s\n" +msgstr "" + +#, python-format +msgid " file %s -> %s\n" +msgstr "" + +#, python-format +msgid "'\\n' and '\\r' disallowed in filenames: %r" +msgstr "" + +#, python-format +msgid "directory %r already in dirstate" +msgstr "" + +#, python-format +msgid "file %r in dirstate clashes with %r" +msgstr "" + +#, python-format +msgid "not in dirstate: %s\n" +msgstr "" + +msgid "character device" +msgstr "" + +msgid "block device" +msgstr "" + +msgid "fifo" +msgstr "" + +msgid "socket" +msgstr "" + +msgid "directory" +msgstr "" + +#, python-format +msgid "%s: unsupported file type (type is %s)\n" +msgstr "" + +#, python-format +msgid "abort: %s\n" +msgstr "" + +#, python-format +msgid "" +"hg: command '%s' is ambiguous:\n" +" %s\n" +msgstr "" + +#, python-format +msgid "timed out waiting for lock held by %s" +msgstr "" + +#, python-format +msgid "lock held by %s" +msgstr "" + +#, python-format +msgid "abort: %s: %s\n" +msgstr "" + +#, python-format +msgid "abort: could not lock %s: %s\n" +msgstr "" + +#, python-format +msgid "hg %s: %s\n" +msgstr "" + +#, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format +msgid "abort: %s!\n" +msgstr "" + +#, python-format +msgid "abort: %s" +msgstr "" + +msgid " empty string\n" +msgstr "" + +msgid "killed!\n" +msgstr "" + +#, python-format +msgid "hg: unknown command '%s'\n" +msgstr "" + +#, python-format +msgid "abort: could not import module %s!\n" +msgstr "" + +msgid "(did you forget to compile extensions?)\n" +msgstr "" + +msgid "(is your Python install correct?)\n" +msgstr "" + +#, python-format +msgid "abort: error: %s\n" +msgstr "" + +msgid "broken pipe\n" +msgstr "" + +msgid "interrupted!\n" +msgstr "" + +msgid "" +"\n" +"broken pipe\n" +msgstr "" + +msgid "abort: out of memory\n" +msgstr "" + +msgid "** unknown exception encountered, details follow\n" +msgstr "" + +msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgstr "" + +msgid "** or mercurial@selenic.com\n" +msgstr "" + +#, python-format +msgid "** Mercurial Distributed SCM (version %s)\n" +msgstr "** Mercurial - 分散構成管理(バージョン %s)\n" + +#, python-format +msgid "** Extensions loaded: %s\n" +msgstr "" + +#, python-format +msgid "malformed --config option: %s" +msgstr "" + +#, python-format +msgid "extension '%s' overrides commands: %s\n" +msgstr "" + +msgid "Option --config may not be abbreviated!" +msgstr "" + +msgid "Option --cwd may not be abbreviated!" +msgstr "" + +msgid "" +"Option -R has to be separated from other options (i.e. not -qR) and --" +"repository may only be abbreviated as --repo!" +msgstr "" + +#, python-format +msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" +msgstr "" + +#, python-format +msgid "repository '%s' is not local" +msgstr "" + +msgid "invalid arguments" +msgstr "" + +msgid "exception raised - generating profile anyway\n" +msgstr "" + +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" + +#, python-format +msgid "*** failed to import extension %s from %s: %s\n" +msgstr "" + +#, python-format +msgid "*** failed to import extension %s: %s\n" +msgstr "" + +#, python-format +msgid "couldn't find merge tool %s\n" +msgstr "" + +#, python-format +msgid "tool %s can't handle symlinks\n" +msgstr "" + +#, python-format +msgid "tool %s can't handle binary\n" +msgstr "" + +#, python-format +msgid "tool %s requires a GUI\n" +msgstr "" + +#, python-format +msgid "picked tool '%s' for %s (binary %s symlink %s)\n" +msgstr "" + +#, python-format +msgid "" +" no tool found to merge %s\n" +"keep (l)ocal or take (o)ther?" +msgstr "" + +msgid "[lo]" +msgstr "" + +msgid "l" +msgstr "" + +#, python-format +msgid "merging %s and %s to %s\n" +msgstr "" + +#, python-format +msgid "merging %s\n" +msgstr "" + +#, python-format +msgid "my %s other %s ancestor %s\n" +msgstr "" + +msgid " premerge successful\n" +msgstr "" + +#, python-format +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +msgid "[yn]" +msgstr "" + +msgid "n" +msgstr "" + +#, python-format +msgid "merging %s failed!\n" +msgstr "" + +#, python-format +msgid "Inconsistent state, %s:%s is good and bad" +msgstr "" + +#, python-format +msgid "unknown bisect kind %s" +msgstr "" + +msgid "Date Formats" +msgstr "日時表記" + +msgid "" +"\n" +" Some commands allow the user to specify a date, e.g.:\n" +" * backout, commit, import, tag: Specify the commit date.\n" +" * log, revert, update: Select revision(s) by date.\n" +"\n" +" Many date formats are valid. Here are some examples:\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +" Lastly, there is Mercurial's internal format:\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +" This is the internal representation format for dates. unixtime is\n" +" the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n" +" is the offset of the local timezone, in seconds west of UTC (negative\n" +" if the timezone is east of UTC).\n" +"\n" +" The log command also accepts date ranges:\n" +"\n" +" \"<{date}\" - on or before a given date\n" +" \">{date}\" - on or after a given date\n" +" \"{date} to {date}\" - a date range, inclusive\n" +" \"-{days}\" - within a given number of days of today\n" +" " +msgstr "" +"\n" +" 以下のコマンドで日時指定が可能です:\n" +" * backout, commit, import, tag: コミット日時の指定\n" +" * log, revert, update: 日時によるリビジョンの指定\n" +"\n" +" 有効な日時指定形式は沢山あります。以下にいくつかの例を示します。\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (「ローカルタイムゾーン」を想定)\n" +" \"Dec 6 13:18 -0600\" (「今年」を想定、タイムゾーンはオフセット指定)\n" +" \"Dec 6 13:18 UTC\" (UTC および GMT は +0000 の別名)\n" +" \"Dec 6\" (「午前0時」を想定)\n" +" \"13:18\" (「本日」を想定)\n" +" \"3:39\" (「3:39AM」を想定)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 形式)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (2006年12月6日)\n" +"\n" +" 最後に、Mercurial 固有の内部形式を示します。\n" +"\n" +" \"1165432709 0\" (2006年12月6日 13:18:29 UTC)\n" +"\n" +" これは日時の内部表現形式です。基点となる 1970年1月1日 00:00 UTC からの\n" +" 経過秒数を表す unixtime 形式部分と、ローカルタイムゾーンのオフセット値\n" +" (UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。\n" +"\n" +" log コマンドには、日時範囲指定可能です:\n" +"\n" +" \"<{date}\" - 指定日時以前(指定日時含む)\n" +" \">{date}\" - 指定日時以後(指定日時含む)\n" +" \"{date} to {date}\" - 指定日時範囲(指定日時含む)\n" +" \"-{days}\" - 本日から指定日数以内\n" +" " + +msgid "File Name Patterns" +msgstr "ファイル名パターン" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying one or more\n" +" files at a time.\n" +"\n" +" By default, Mercurial treats filenames as shell-style extended\n" +" glob patterns.\n" +"\n" +" Alternate pattern notations must be specified explicitly.\n" +"\n" +" To use a plain path name without any pattern matching, start a\n" +" name with \"path:\". These path names must match completely, from\n" +" the root of the current repository.\n" +"\n" +" To use an extended glob, start a name with \"glob:\". Globs are\n" +" rooted at the current directory; a glob such as \"*.c\" will match\n" +" files ending in \".c\" in the current directory only.\n" +"\n" +" The supported glob syntax extensions are \"**\" to match any string\n" +" across path separators, and \"{a,b}\" to mean \"a or b\".\n" +"\n" +" To use a Perl/Python regular expression, start a name with \"re:\".\n" +" Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +" Plain examples:\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root of\n" +" the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +" Glob examples:\n" +"\n" +" glob:*.c any name ending in \".c\" in the current directory\n" +" *.c any name ending in \".c\" in the current directory\n" +" **.c any name ending in \".c\" in the current directory, or\n" +" any subdirectory\n" +" foo/*.c any name ending in \".c\" in the directory foo\n" +" foo/**.c any name ending in \".c\" in the directory foo, or any\n" +" subdirectory\n" +"\n" +" Regexp examples:\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +"\n" +" " +msgstr "" +"\n" +" Mercurial には、ファイルを特定するパターン指定方法が複数あります。\n" +"\n" +" 特に指定の無い場合、Mercurial は指定されたファイル名に対して、\n" +" shell 形式の拡張ワイルドカード合致を行います。\n" +"\n" +" 別な形式でのパターン記述の際には、明示的に種別を指定してください。\n" +"\n" +" パターン合致を行わずに、指定された名前をそのまま使用する場合、\n" +" 名前の前に \"path:\" を記述します。この形式を使用する場合、\n" +" リポジトリのルートからのパスと完全に一致しなければなりません。\n" +"\n" +" 拡張ワイルドカード合致の場合、名前の前に \"glob:\" を記述します。この\n" +" 形式では、現ディレクトリからの相対になりますので、\"*.c\" パターンは\n" +" 末尾が \"*.c\" で終わる現ディレクトリ中のファイルとのみ合致します。\n" +"\n" +" ワイルドカードの拡張文法には、パス区切りも含めた任意の文字列と合致する\n" +" \"**\" と、\"a ないし b\" を意味する \"{a,b}\" という形式があります。\n" +"\n" +" Perl/Python 形式の正規表現の場合、名前の前に \"re:\" を記述します。\n" +" 正規表現形式では、リポジトリのルートからの合致を意味する \"^\" 指定が\n" +" パターン先頭に自動的に付与されます(訳注: .hgignore での指定では付与\n" +" 「されません」ので注意が必要です)。\n" +"\n" +" パターン合致未使用例:\n" +"\n" +" path:foo/bar リポジトリルート直下の foo ディレクトリ中の bar\n" +" path:path:name \"path:name\" という名前\n" +"\n" +" ワイルドカード指定例:\n" +"\n" +" glob:*.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n" +" *.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n" +" **.c 現ディレクトリないしその配下のディレクトリにおいて、\n" +" 名前が \".c\" で終わるもの\n" +" foo/*.c foo ディレクトリ直下で、名前が \".c\" で終わるもの\n" +" foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n" +" 名前が \".c\" で終わるもの\n" +"\n" +" 正規表現指定例:\n" +"\n" +" re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n" +"\n" +" " + +msgid "Environment Variables" +msgstr "環境変数" + +msgid "" +"\n" +"HG::\n" +" Path to the 'hg' executable, automatically passed when running hooks,\n" +" extensions or external tools. If unset or empty, an executable named\n" +" 'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n" +"\n" +"HGEDITOR::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING::\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE::\n" +" This sets Mercurial's behavior for handling unknown characters\n" +" while transcoding user inputs. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't translate a character. Other\n" +" settings include \"replace\", which replaces unknown characters, and\n" +" \"ignore\", which drops them. This setting can be overridden with\n" +" the --encodingmode command-line option.\n" +"\n" +"HGMERGE::\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGRCPATH::\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only .hg/hgrc of\n" +" current repository is read.\n" +"\n" +" For each element in path, if a directory, all entries in directory\n" +" ending with \".rc\" are added to path. Else, element itself is\n" +" added to path.\n" +"\n" +"HGUSER::\n" +" This is the string used for the author of a commit.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL::\n" +" If HGUSER is not set, this will be used as the author for a commit.\n" +"\n" +"LOGNAME::\n" +" If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n" +" '@hostname' appended) as the author value for a commit.\n" +"\n" +"VISUAL::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"EDITOR::\n" +" Sometimes Mercurial needs to open a text file in an editor\n" +" for a user to modify, for example when writing commit messages.\n" +" The editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH::\n" +" This is used by Python to find imported modules and may need to be set\n" +" appropriately if Mercurial is not installed system-wide.\n" +" " +msgstr "" +"\n" +"HG::\n" +" 'hg' コマンドへのパス。フック／エクステンションないし外部ツールの起動の\n" +" 際に自動的に設定されます。未設定や空の場合は、'hg' という名前の実行可能\n" +" ファイルが検索されます(Windows の場合 com/exe/bat/cmd 等の拡張子付き)。\n" +"\n" +"HGEDITOR::\n" +" コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n" +" についても参照してください。\n" +"\n" +" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" +"\n" +"HGENCODING::\n" +" Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n" +" コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n" +" 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n" +" オプションの使用により、更に上書きすることが出来ます。\n" +"\n" +"HGENCODINGMODE::\n" +" ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n" +" 合致しない文字が検出された場合の Mercurial の挙動の指定。無指定時は、\n" +" 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n" +" されたものとみなします。他には、「未知の文字の置き換え」を意味する\n" +" \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n" +" 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n" +" オプションの使用により、更に上書きすることが出来ます。\n" +"\n" +"HGMERGE::\n" +" マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n" +" 作業領域のファイル、別リビジョンのファイル、両者の親リビジョンの\n" +" ファイルを表す3つの引数が指定されます。\n" +"\n" +" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" +"\n" +"HGRCPATH::\n" +" 設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n" +" 一覧要素の区切り記号は、Unix なら \":\"、WIndows なら \";\" です。\n" +" HGRCPATH 環境変数が設定されていない場合、各稼働環境に応じた\n" +" 読み込み先から読み込まれます。空の値が設定されている場合、\n" +" 現リポジトリの .hg/hgrc のみが読み込まれます。\n" +"\n" +" 指定された一覧の各要素に対して、ディレクトリ指定なら当該ディレクトリ\n" +" 配下の \".rc\" で終わる名前のファイルが、ファイル指定の場合はその\n" +" ファイル自身が、読み込み対象となります。\n" +"\n" +"HGUSER::\n" +" チェンジセット作成者としてコミット時に記録する名前の指定。\n" +"\n" +" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" +"\n" +"EMAIL::\n" +" HGUSER 環境変数が設定されていない場合、チェンジセット作成者として\n" +" コミット時にこの環境変数値が記録されます。\n" +"\n" +"LOGNAME::\n" +" HGUSER も EMAIL も共に設定されていない場合、チェンジセット作成者として\n" +" コミット時に('@hostname' を追加した)この環境変数値が記録されます。\n" +"\n" +"VISUAL::\n" +" コミット時のメッセージを編集するエディタ名の指定。EDITOR 環境変数\n" +" についても参照してください。\n" +"\n" +"EDITOR::\n" +" コミット時のメッセージのように、エディタでファイルを開き、ユーザによる\n" +" 編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n" +" あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n" +" 最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n" +" (あるいは空)の場合は、'vi' が使用されます。\n" +"\n" +"PYTHONPATH::\n" +" Mercurial が当該システムの共有領域にインストールされていない場合、\n" +" Python が必要なモジュールを読み込むためには、この変数変数の設定が\n" +" 必要です。\n" +" " + +msgid "Specifying Single Revisions" +msgstr "単一リビジョンの指定" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying individual\n" +" revisions.\n" +"\n" +" A plain integer is treated as a revision number. Negative\n" +" integers are treated as offsets from the tip, with -1 denoting the\n" +" tip.\n" +"\n" +" A 40-digit hexadecimal string is treated as a unique revision\n" +" identifier.\n" +"\n" +" A hexadecimal string less than 40 characters long is treated as a\n" +" unique revision identifier, and referred to as a short-form\n" +" identifier. A short-form identifier is only valid if it is the\n" +" prefix of one full-length identifier.\n" +"\n" +" Any other string is treated as a tag name, which is a symbolic\n" +" name associated with a revision identifier. Tag names may not\n" +" contain the \":\" character.\n" +"\n" +" The reserved name \"tip\" is a special tag that always identifies\n" +" the most recent revision.\n" +"\n" +" The reserved name \"null\" indicates the null revision. This is the\n" +" revision of an empty repository, and the parent of revision 0.\n" +"\n" +" The reserved name \".\" indicates the working directory parent. If\n" +" no working directory is checked out, it is equivalent to null.\n" +" If an uncommitted merge is in progress, \".\" is the revision of\n" +" the first parent.\n" +" " +msgstr "" +"\n" +" Mercurial は、個々のリビジョンを識別する記法を幾つか用意しています。\n" +"\n" +" 整数値は「リビジョン番号」とみなされます。負値は、tip からの距離を\n" +" 表します(-1 は tip を表します)。\n" +"\n" +" 40桁の16進文字列は、一意な「リビジョン識別子」とみなされます。\n" +"\n" +" 40桁未満の16進文字列は、一意な「リビジョン識別子」の短縮形式と\n" +" みなされます。短縮形式の識別子は、唯一の完全長の識別子と前方一致する\n" +" 場合にのみ有効です。\n" +"\n" +" それ以外の文字列は、リビジョン識別子に関連付けられた「タグ名」と\n" +" みなされます。タグ名は \":\" を含んでいないかもしれない。\n" +"\n" +" 「最新のリビジョン」を示すための名前 \"tip\" は、特別な名前として予約\n" +" されています。\n" +"\n" +" 「空リビジョン」を示すための名前 \"null\" は、特別な名前として予約\n" +" されており、リビジョン 0 の親は \"null\" リビジョンです。\n" +"\n" +" 「作業領域の親リビジョン」を示すための名前 \".\" は、特別な名前として\n" +" 予約されています。作業領域が未更新の場合は、\"null\" 指定と等価です。\n" +" 未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n" +" " + +msgid "Specifying Multiple Revisions" +msgstr "複数リビジョンの指定" + +msgid "" +"\n" +" When Mercurial accepts more than one revision, they may be\n" +" specified individually, or provided as a continuous range,\n" +" separated by the \":\" character.\n" +"\n" +" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" +" are revision identifiers. Both BEGIN and END are optional. If\n" +" BEGIN is not specified, it defaults to revision number 0. If END\n" +" is not specified, it defaults to the tip. The range \":\" thus\n" +" means \"all revisions\".\n" +"\n" +" If BEGIN is greater than END, revisions are treated in reverse\n" +" order.\n" +"\n" +" A range acts as a closed interval. This means that a range of 3:5\n" +" gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.\n" +" " +msgstr "" +"\n" +" Mercurial が複数のリビジョン指定を受け付ける場合の指定方法は、\n" +" 個々のリビジョンをそれぞれ指定する方法以外にも、\":\" を区切り\n" +" 記号にした範囲指定による方法があります。\n" +"\n" +" 範囲表記の文法は、\"[開始]:[終了]\" というもので、\"開始\"・\"終了\"\n" +" 部分にはそれぞれリビジョン識別用の情報が記述されます。\n" +" \"開始\"・\"終了\" はそれぞれ省略可能です。\"開始\" 部分が\n" +" 記述されない場合、リビジョン番号 0 が記述されたものとみなされます。\n" +" \"終了\" 部分が記述されない場合、tip が記述されたものとみなされます。\n" +" 以上のことから、\":\" という記述は \"全リビジョン\" を指します。\n" +"\n" +" \"開始\" 指定が \"終了\" 指定よりも後のリビジョンである場合、逆順指定\n" +" とみなされます。\n" +"\n" +" 範囲指定は \"閉区間\" とみなされます。つまり、3:5 という範囲指定は\n" +" 3, 4, 5 の指定と等価です。同様に 4:2 という範囲指定は 4, 3, 2 の指定と\n" +" 等価です。\n" +" " + +msgid "Diff Formats" +msgstr "差分形式" + +msgid "" +"\n" +" Mercurial's default format for showing changes between two versions\n" +" of a file is compatible with the unified format of GNU diff, which\n" +" can be used by GNU patch and many other standard tools.\n" +"\n" +" While this standard format is often enough, it does not encode the\n" +" following information:\n" +"\n" +" - executable status\n" +" - copy or rename information\n" +" - changes in binary files\n" +" - creation or deletion of empty files\n" +"\n" +" Mercurial also supports the extended diff format from the git VCS\n" +" which addresses these limitations. The git diff format is not\n" +" produced by default because there are very few tools which\n" +" understand this format.\n" +"\n" +" This means that when generating diffs from a Mercurial repository\n" +" (e.g. with \"hg export\"), you should be careful about things like\n" +" file copies and renames or other things mentioned above, because\n" +" when applying a standard diff to a different repository, this extra\n" +" information is lost. Mercurial's internal operations (like push and\n" +" pull) are not affected by this, because they use an internal binary\n" +" format for communicating changes.\n" +"\n" +" To make Mercurial produce the git extended diff format, use the\n" +" --git option available for many commands, or set 'git = True' in the\n" +" [diff] section of your hgrc. You do not need to set this option when\n" +" importing diffs in this format or using them in the mq extension.\n" +" " +msgstr "" +"\n" +" 無指定時に Mercurial が2つのリビジョンを比較して差分表示する際の形式は\n" +" GNU diff の unified 形式互換のもので、GNU patch をはじめとする多くの\n" +" 標準的なツールで使用できるものです。\n" +"\n" +" この標準的な形式は概ね十分なのですが、以下のような情報は含まれません:\n" +"\n" +" - 実行可否(権限設定)\n" +" - 複製／改名情報\n" +" - バイナリファイルの変更\n" +" - 空ファイルの作成／削除\n" +"\n" +" Mercurial は、別の構成管理ツールである git に由来する拡張差分形式にも\n" +" 対応しており、この形式は従来の差分形式の持つ先の制限を解消しています。\n" +" 但し、殆どのツールが git 差分形式に対応していないため、Mercurial は\n" +" 指定が無い場合はこの形式では出力しません。\n" +"\n" +" つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n" +" 他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n" +" ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n" +" 十分注意する必要があります。push や pull のように、Mercurial の\n" +" 内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n" +" ことから、情報の欠落に関しては心配する必要はありません。\n" +"\n" +" Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n" +" 対して --git オプションを指定するか、設定ファイルの [diff] セクションに\n" +" 'git = True' 記述を追加してください。hg import や mq エクステンションを\n" +" 使用する場合は、この指定は不要です。\n" +" " + +msgid "Template Usage" +msgstr "テンプレートの利用" + +msgid "" +"\n" +" Mercurial allows you to customize output of commands through\n" +" templates. You can either pass in a template from the command line,\n" +" via the --template option, or select an existing template-style (--" +"style).\n" +"\n" +" You can customize output for any \"log-like\" command: log, outgoing,\n" +" incoming, tip, parents, heads and glog are all template-enabled.\n" +"\n" +" Three styles are packaged with Mercurial: default (the style used\n" +" when no explicit preference is passed), compact and changelog. Usage:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" A template is a piece of text, with markup to invoke variable " +"expansion:\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" Strings in curly braces are called keywords. The availability of\n" +" keywords depends on the exact context of the templater. These keywords\n" +" are usually available for templating a log-like command:\n" +"\n" +" - author: String. The unmodified author of the changeset.\n" +" - branches: String. The name of the branch on which the changeset\n" +" was committed. Will be empty if the branch name was default.\n" +" - date: Date information. The date when the changeset was committed.\n" +" - desc: String. The text of the changeset description.\n" +" - files: List of strings. All files modified, added, or removed by\n" +" this changeset.\n" +" - file_adds: List of strings. Files added by this changeset.\n" +" - file_mods: List of strings. Files modified by this changeset.\n" +" - file_dels: List of strings. Files removed by this changeset.\n" +" - node: String. The changeset identification hash, as a 40-character\n" +" hexadecimal string.\n" +" - parents: List of strings. The parents of the changeset.\n" +" - rev: Integer. The repository-local changeset revision number.\n" +" - tags: List of strings. Any tags associated with the changeset.\n" +"\n" +" The \"date\" keyword does not produce human-readable output. If you\n" +" want to use a date in your output, you can use a filter to process it.\n" +" Filters are functions which return a string based on the input " +"variable.\n" +" You can also use a chain of filters to get the wanted output:\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" List of filters:\n" +"\n" +" - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" +" every line except the last.\n" +" - age: Date. Returns a human-readable age for the given date.\n" +" - basename: Any text. Treats the text as a path, and returns the\n" +" basename. For example, \"foo/bar/baz\" becomes \"baz\".\n" +" - date: Date. Returns a date in a Unix date command format, including\n" +" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" +" - domain: Any text. Finds the first string that looks like an email\n" +" address, and extracts just the domain component.\n" +" - email: Any text. Extracts the first string that looks like an email\n" +" address.\n" +" - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" +" \"<\" and \">\" with XML entities.\n" +" - fill68: Any text. Wraps the text to fit in 68 columns.\n" +" - fill76: Any text. Wraps the text to fit in 76 columns.\n" +" - firstline: Any text. Returns the first line of text.\n" +" - hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +" - isodate: Date. Returns the date in ISO 8601 format.\n" +" - obfuscate: Any text. Returns the input text rendered as a sequence\n" +" of XML entities.\n" +" - person: Any text. Returns the text before an email address.\n" +" - rfc822date: Date. Returns a date using the same format used\n" +" in email headers.\n" +" - short: Changeset hash. Returns the short form of a changeset hash,\n" +" i.e. a 12-byte hexadecimal string.\n" +" - shortdate: Date. Returns a date like \"2006-09-04\".\n" +" - strip: Any text. Strips all leading and trailing whitespace.\n" +" - tabindent: Any text. Returns the text, with every line except the\n" +" first starting with a tab character.\n" +" - urlescape: Any text. Escapes all \"special\" characters. For example,\n" +" \"foo bar\" becomes \"foo%20bar\".\n" +" - user: Any text. Returns the user portion of an email address.\n" +" " +msgstr "" + +msgid "Url Paths" +msgstr "URLのパス指定" + +msgid "" +"\n" +" Valid URLs are of the form:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" Paths in the local filesystem can either point to Mercurial\n" +" repositories or to bundle files (as created by 'hg bundle' or\n" +" 'hg incoming --bundle').\n" +"\n" +" An optional identifier after # indicates a particular branch, tag,\n" +" or changeset to deal with in the remote repository.\n" +"\n" +" Some features, such as pushing to http:// and https:// URLs are\n" +" only possible if the feature is explicitly enabled on the\n" +" remote Mercurial server.\n" +"\n" +" Some notes about using SSH with Mercurial:\n" +" - SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +" - path is relative to the remote user's home directory by default.\n" +" Use an extra slash at the start of a path to specify an absolute " +"path:\n" +" ssh://example.com//tmp/repository\n" +" - Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +" These urls can all be stored in your hgrc with path aliases under the\n" +" [paths] section like so:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" You can then use the alias for any command that uses a url (for example\n" +" 'hg pull alias1' would pull from the 'alias1' path).\n" +"\n" +" Two path aliases are more important because they are used as defaults\n" +" when you do not provide the url to a command:\n" +"\n" +" default:\n" +" When you create a repository with hg clone, the clone command saves\n" +" the location of the source repository as the 'default' path. This is\n" +" then used when you omit a path from the push and pull commands.\n" +"\n" +" default-push:\n" +" The push command will look for a path named 'default-push', and\n" +" prefer it over 'default' if both are defined.\n" +" " +msgstr "" +"\n" +" 有効な URL 指定は以下の形式です:\n" +"\n" +" local/filesystem/path (ないし file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" ローカルファイルシステム上のパスが指す先は Mercurial のリポジトリでも、\n" +" バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n" +" 構いません。\n" +"\n" +" 遠隔ホスト上の連携先リポジトリ指定の場合、'#' 記号に続けて識別子を指定\n" +" することで、特定のブランチ、タグないしチェンジセットを指定することが\n" +" 出来ます。\n" +"\n" +" http:// や https:// 形式の URL で指定される連携先への push の様な\n" +" 機能のうちの幾つかは、その機能が連携先の Mercurial サーバ側で明示的に\n" +" 利用可能になっている場合に限り使用可能です。\n" +"\n" +" Mercurial と SSH を併用する場合の注意点:\n" +" - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n" +" hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n" +" 場合は、--remotecmd オプションで明示的に指定してください。\n" +" - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n" +" からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n" +" 更にスラッシュ('/')を付与してください。\n" +" 例: ssh://example.com//tmp/repository\n" +" - SSH 連携の際には Mercurial は自身の圧縮処理を行いません。以下のように\n" +" ~/.ssh/config 等で SSH の圧縮実施を指示することをお勧めします。\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n" +" --ssh オプションに対して、'ssh -C' を指定する方法もあります。\n" +"\n" +" 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n" +" することが出来ます。\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n" +" (例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。\n" +"\n" +" コマンドに URL を指定しなかった場合に、暗黙の連携先として使用される\n" +" 重要な別名が2つあります。\n" +"\n" +" default:\n" +" 'hg clone' によって複製した場合、複製元リポジトリの URL が\n" +" 'default' として保存されます。以後、連携先を省略して 'hg push' や\n" +" 'hg pull' を実行した際には、この URL が連携先として使用されます。\n" +"\n" +" default-push:\n" +" 'hg push' は、'default-push' の別名で定義される URL を探します。\n" +" 'default' が定義されている場合でも、'default-push' が定義されていれば\n" +" こちらが優先されます。\n" +" " + +#, python-format +msgid "destination directory: %s\n" +msgstr "" + +#, python-format +msgid "destination '%s' already exists" +msgstr "" + +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" +msgstr "" + +msgid "clone from remote to remote not supported" +msgstr "" + +msgid "updating working directory\n" +msgstr "" + +msgid "updated" +msgstr "" + +msgid "merged" +msgstr "" + +msgid "removed" +msgstr "" + +msgid "unresolved" +msgstr "" + +#, python-format +msgid "%d files %s" +msgstr "" + +msgid "use 'hg resolve' to retry unresolved file merges\n" +msgstr "" + +msgid "(branch merge, don't forget to commit)\n" +msgstr "" + +#, python-format +msgid "error reading %s/.hg/hgrc: %s\n" +msgstr "" + +msgid "SSL support is unavailable" +msgstr "" + +msgid "IPv6 not available on this system" +msgstr "" + +#, python-format +msgid "cannot start server at '%s:%d': %s" +msgstr "" + +#, python-format +msgid "calling hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" not in a module)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (import of \"%s\" failed)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not defined)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not callable)" +msgstr "" + +#, python-format +msgid "error: %s hook failed: %s\n" +msgstr "" + +#, python-format +msgid "error: %s hook raised an exception: %s\n" +msgstr "" + +#, python-format +msgid "%s hook failed" +msgstr "" + +#, python-format +msgid "warning: %s hook failed\n" +msgstr "" + +#, python-format +msgid "running hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook %s" +msgstr "" + +#, python-format +msgid "warning: %s hook %s\n" +msgstr "" + +msgid "connection ended unexpectedly" +msgstr "" + +#, python-format +msgid "unsupported URL component: \"%s\"" +msgstr "" + +#, python-format +msgid "using %s\n" +msgstr "" + +#, python-format +msgid "capabilities: %s\n" +msgstr "" + +msgid "operation not supported over http" +msgstr "" + +#, python-format +msgid "sending %s command\n" +msgstr "" + +#, python-format +msgid "sending %s bytes\n" +msgstr "" + +msgid "authorization failed" +msgstr "" + +#, python-format +msgid "http error while sending %s command\n" +msgstr "" + +msgid "http error, possibly caused by proxy setting" +msgstr "" + +#, python-format +msgid "real URL is %s\n" +msgstr "" + +#, python-format +msgid "Requested URL: '%s'\n" +msgstr "" + +#, python-format +msgid "'%s' does not appear to be an hg repository" +msgstr "" + +#, python-format +msgid "'%s' sent a broken Content-Type header (%s)" +msgstr "" + +#, python-format +msgid "'%s' uses newer protocol %s" +msgstr "" + +msgid "look up remote revision" +msgstr "" + +msgid "unexpected response:" +msgstr "" + +msgid "look up remote changes" +msgstr "" + +msgid "push failed (unexpected response):" +msgstr "" + +#, python-format +msgid "push failed: %s" +msgstr "" + +msgid "Python support for SSL and HTTPS is not installed" +msgstr "" + +msgid "cannot create new http repository" +msgstr "" + +#, python-format +msgid "%s: ignoring invalid syntax '%s'\n" +msgstr "" + +#, python-format +msgid "skipping unreadable ignore file '%s': %s\n" +msgstr "" + +#, python-format +msgid "repository %s not found" +msgstr "" + +#, python-format +msgid "repository %s already exists" +msgstr "" + +#, python-format +msgid "requirement '%s' not supported" +msgstr "" + +#, python-format +msgid "%r cannot be used in a tag name" +msgstr "" + +msgid "working copy of .hgtags is changed (please commit .hgtags manually)" +msgstr "" + +#, python-format +msgid "%s, line %s: %s\n" +msgstr "" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + +#, python-format +msgid "tag '%s' refers to unknown node" +msgstr "" + +#, python-format +msgid "unknown revision '%s'" +msgstr "" + +#, python-format +msgid "filtering %s through %s\n" +msgstr "" + +msgid "journal already exists - run hg recover" +msgstr "" + +msgid "rolling back interrupted transaction\n" +msgstr "" + +msgid "no interrupted transaction available\n" +msgstr "" + +msgid "rolling back last transaction\n" +msgstr "" + +#, python-format +msgid "Named branch could not be reset, current branch still is: %s\n" +msgstr "" + +msgid "no rollback information available\n" +msgstr "" + +#, python-format +msgid "waiting for lock on %s held by %r\n" +msgstr "" + +#, python-format +msgid "repository %s" +msgstr "" + +#, python-format +msgid "working directory of %s" +msgstr "" + +#, python-format +msgid " %s: searching for copy revision for %s\n" +msgstr "" + +#, python-format +msgid " %s: copy %s:%s\n" +msgstr "" + +msgid "cannot partially commit a merge (do not specify files or patterns)" +msgstr "" + +#, python-format +msgid "%s not tracked!\n" +msgstr "" + +msgid "unresolved merge conflicts (see hg resolve)" +msgstr "" + +msgid "nothing changed\n" +msgstr "" + +#, python-format +msgid "trouble committing %s!\n" +msgstr "" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "" + +msgid "empty commit message" +msgstr "" + +#, python-format +msgid "%s does not exist!\n" +msgstr "" + +#, python-format +msgid "" +"%s: files over 10MB may cause memory and performance problems\n" +"(use 'hg revert %s' to unadd the file)\n" +msgstr "" + +#, python-format +msgid "%s not added: only files and symlinks supported currently\n" +msgstr "" + +#, python-format +msgid "%s already tracked!\n" +msgstr "" + +#, python-format +msgid "%s not added!\n" +msgstr "" + +#, python-format +msgid "%s still exists!\n" +msgstr "" + +#, python-format +msgid "%s not removed!\n" +msgstr "" + +#, python-format +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "" + +msgid "searching for changes\n" +msgstr "" + +#, python-format +msgid "examining %s:%s\n" +msgstr "" + +msgid "branch already found\n" +msgstr "" + +#, python-format +msgid "found incomplete branch %s:%s\n" +msgstr "" + +#, python-format +msgid "found new changeset %s\n" +msgstr "" + +#, python-format +msgid "request %d: %s\n" +msgstr "" + +#, python-format +msgid "received %s:%s\n" +msgstr "" + +#, python-format +msgid "narrowing %d:%d %s\n" +msgstr "" + +#, python-format +msgid "found new branch changeset %s\n" +msgstr "" + +#, python-format +msgid "narrowed branch search to %s:%s\n" +msgstr "" + +msgid "already have changeset " +msgstr "" + +msgid "warning: repository is unrelated\n" +msgstr "" + +msgid "repository is unrelated" +msgstr "" + +msgid "found new changesets starting at " +msgstr "" + +#, python-format +msgid "%d total queries\n" +msgstr "" + +msgid "common changesets up to " +msgstr "" + +msgid "requesting all changes\n" +msgstr "" + +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." +msgstr "" + +msgid "abort: push creates new remote heads!\n" +msgstr "" + +msgid "(did you forget to merge? use push -f to force)\n" +msgstr "" + +msgid "note: unsynced remote changes!\n" +msgstr "" + +#, python-format +msgid "%d changesets found\n" +msgstr "" + +msgid "list of changesets:\n" +msgstr "" + +#, python-format +msgid "empty or missing revlog for %s" +msgstr "" + +#, python-format +msgid "add changeset %s\n" +msgstr "" + +msgid "adding changesets\n" +msgstr "" + +msgid "received changelog group is empty" +msgstr "" + +msgid "adding manifests\n" +msgstr "" + +msgid "adding file changes\n" +msgstr "" + +#, python-format +msgid "adding %s revisions\n" +msgstr "" + +msgid "received file revlog group is empty" +msgstr "" + +#, python-format +msgid " (%+d heads)" +msgstr "" + +#, python-format +msgid "added %d changesets with %d changes to %d files%s\n" +msgstr "" + +msgid "updating the branch cache\n" +msgstr "" + +msgid "Unexpected response from remote server:" +msgstr "" + +msgid "operation forbidden by server" +msgstr "" + +msgid "locking the remote repository failed" +msgstr "" + +msgid "the server sent an unknown error code" +msgstr "" + +msgid "streaming all changes\n" +msgstr "" + +#, python-format +msgid "%d files to transfer, %s of data\n" +msgstr "" + +#, python-format +msgid "adding %s (%s)\n" +msgstr "" + +#, python-format +msgid "transferred %s in %.1f seconds (%s/sec)\n" +msgstr "" + +msgid "no [smtp]host in hgrc - cannot send mail" +msgstr "" + +#, python-format +msgid "sending mail: smtp host %s, port %s\n" +msgstr "" + +msgid "can't use TLS: Python SSL support not installed" +msgstr "" + +msgid "(using tls)\n" +msgstr "" + +#, python-format +msgid "(authenticating to mail server as %s)\n" +msgstr "" + +#, python-format +msgid "sending mail: %s\n" +msgstr "" + +msgid "smtp specified as email transport, but no smtp host configured" +msgstr "" + +#, python-format +msgid "%r specified as email transport, but not in PATH" +msgstr "" + +#, python-format +msgid "ignoring invalid sendcharset: %s\n" +msgstr "" + +#, python-format +msgid "invalid email address: %s" +msgstr "" + +#, python-format +msgid "invalid local address: %s" +msgstr "" + +msgid "'\\n' and '\\r' disallowed in filenames" +msgstr "" + +#, python-format +msgid "failed to remove %s from manifest" +msgstr "" + +#, python-format +msgid "diff context lines count must be an integer, not %r" +msgstr "" + +#, python-format +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" +msgstr "" + +#, python-format +msgid "case-folding collision between %s and %s" +msgstr "" + +msgid "resolving manifests\n" +msgstr "" + +#, python-format +msgid " overwrite %s partial %s\n" +msgstr "" + +#, python-format +msgid " ancestor %s local %s remote %s\n" +msgstr "" + +#, python-format +msgid "" +" conflicting flags for %s\n" +"(n)one, e(x)ec or sym(l)ink?" +msgstr "" + +#, python-format +msgid "" +" local changed %s which remote deleted\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +msgid "[cd]" +msgstr "" + +msgid "c" +msgstr "" + +#, python-format +msgid "" +"remote changed %s which local deleted\n" +"use (c)hanged version or leave (d)eleted?" +msgstr "" + +#, python-format +msgid "preserving %s for resolve of %s\n" +msgstr "" + +#, python-format +msgid "update failed to remove %s: %s!\n" +msgstr "" + +#, python-format +msgid "getting %s\n" +msgstr "" + +#, python-format +msgid "moving %s to %s\n" +msgstr "" + +#, python-format +msgid "getting %s to %s\n" +msgstr "" + +#, python-format +msgid "warning: detected divergent renames of %s to:\n" +msgstr "" + +#, python-format +msgid "branch %s not found" +msgstr "" + +msgid "can't merge with ancestor" +msgstr "" + +msgid "nothing to merge (use 'hg update' or check 'hg heads')" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C')" +msgstr "" + +msgid "crosses named branches (use 'hg update -C' to discard changes)" +msgstr "" + +#, python-format +msgid "cannot create %s: destination already exists" +msgstr "" + +#, python-format +msgid "cannot create %s: unable to create destination directory" +msgstr "" + +#, python-format +msgid "found patch at byte %d\n" +msgstr "" + +msgid "patch generated by hg export\n" +msgstr "" + +#, python-format +msgid "unable to find '%s' for patching\n" +msgstr "" + +#, python-format +msgid "patching file %s\n" +msgstr "" + +#, python-format +msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d %s (%d %d %d %d)" +msgstr "" + +#, python-format +msgid "file %s already exists\n" +msgstr "" + +#, python-format +msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" +msgstr "" + +#, python-format +msgid "Hunk #%d FAILED at %d\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d" +msgstr "" + +#, python-format +msgid "bad hunk #%d old text line %d" +msgstr "" + +msgid "could not extract binary patch" +msgstr "" + +#, python-format +msgid "binary patch is %d bytes, not %d" +msgstr "" + +#, python-format +msgid "unable to strip away %d dirs from %s" +msgstr "" + +msgid "undefined source and destination files" +msgstr "" + +#, python-format +msgid "malformed patch %s %s" +msgstr "" + +#, python-format +msgid "unsupported parser state: %s" +msgstr "" + +#, python-format +msgid "patch command failed: %s" +msgstr "" + +#, python-format +msgid "no valid hunks found; trying with %r instead\n" +msgstr "" + +#, python-format +msgid "saving bundle to %s\n" +msgstr "" + +msgid "adding branch\n" +msgstr "" + +#, python-format +msgid "cannot %s; remote repository does not support the %r capability" +msgstr "" + +#, python-format +msgid "unknown compression type %r" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for format v0" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for revlogng" +msgstr "" + +#, python-format +msgid "index %s unknown format %d" +msgstr "" + +msgid "no node" +msgstr "" + +msgid "ambiguous identifier" +msgstr "" + +msgid "no match found" +msgstr "" + +#, python-format +msgid "incompatible revision flag %x" +msgstr "" + +#, python-format +msgid "%s not found in the transaction" +msgstr "" + +msgid "unknown base" +msgstr "" + +msgid "consistency error adding group" +msgstr "" + +#, python-format +msgid "%s looks like a binary file." +msgstr "" + +msgid "can only specify two labels." +msgstr "" + +msgid "warning: conflicts during merge.\n" +msgstr "" + +#, python-format +msgid "couldn't parse location %s" +msgstr "" + +msgid "could not create remote repo" +msgstr "" + +msgid "remote: " +msgstr "" + +msgid "no suitable response from remote hg" +msgstr "" + +#, python-format +msgid "push refused: %s" +msgstr "" + +msgid "unsynced changes" +msgstr "" + +msgid "cannot lock static-http repository" +msgstr "" + +msgid "cannot create new static-http repository" +msgstr "" + +#, python-format +msgid "invalid entry in fncache, line %s" +msgstr "" + +msgid "scanning\n" +msgstr "" + +#, python-format +msgid "%d files, %d bytes to transfer\n" +msgstr "" + +#, python-format +msgid "sending %s (%d bytes)\n" +msgstr "" + +msgid "unmatched quotes" +msgstr "" + +#, python-format +msgid "style not found: %s" +msgstr "" + +#, python-format +msgid "%s:%s: parse error" +msgstr "" + +#, python-format +msgid "template file %s: %s" +msgstr "" + +#, python-format +msgid "Error expanding '%s%%%s'" +msgstr "" + +msgid "transaction abort!\n" +msgstr "" + +#, python-format +msgid "failed to truncate %s\n" +msgstr "" + +msgid "rollback completed\n" +msgstr "" + +#, python-format +msgid "Not trusting file %s from untrusted user %s, group %s\n" +msgstr "" + +#, python-format +msgid "" +"Failed to parse %s\n" +"%s" +msgstr "" + +#, python-format +msgid "Ignored: %s\n" +msgstr "" + +#, python-format +msgid "unable to open %s: %s" +msgstr "" + +#, python-format +msgid "" +"failed to parse %s\n" +"%s" +msgstr "" + +#, python-format +msgid "" +"Error in configuration section [%s] parameter '%s':\n" +"%s" +msgstr "" + +#, python-format +msgid "Ignoring untrusted configuration option %s.%s = %s\n" +msgstr "" + +#, python-format +msgid "" +"Error in configuration section [%s]:\n" +"%s" +msgstr "" + +msgid "enter a commit username:" +msgstr "" + +#, python-format +msgid "No username found, using '%s' instead\n" +msgstr "" + +msgid "Please specify a username." +msgstr "" + +#, python-format +msgid "username %s contains a newline\n" +msgstr "" + +msgid "unrecognized response\n" +msgstr "" + +msgid "response expected" +msgstr "" + +msgid "password: " +msgstr "" + +msgid "edit failed" +msgstr "" + +msgid "http authorization required" +msgstr "" + +msgid "http authorization required\n" +msgstr "" + +#, python-format +msgid "realm: %s\n" +msgstr "" + +#, python-format +msgid "user: %s\n" +msgstr "" + +msgid "user:" +msgstr "" + +#, python-format +msgid "proxying through http://%s:%s\n" +msgstr "" + +#, python-format +msgid "http auth: user %s, password %s\n" +msgstr "" + +#, python-format +msgid "%s, please check your locale settings" +msgstr "" + +#, python-format +msgid "command '%s' failed: %s" +msgstr "" + +#, python-format +msgid "path contains illegal component: %s" +msgstr "" + +#, python-format +msgid "path %r is inside repo %r" +msgstr "" + +#, python-format +msgid "path %r traverses symbolic link %r" +msgstr "" + +msgid "Hardlinks not supported" +msgstr "" + +msgid "user name not available - set USERNAME environment variable" +msgstr "" + +#, python-format +msgid "exited with status %d" +msgstr "" + +#, python-format +msgid "killed by signal %d" +msgstr "" + +#, python-format +msgid "stopped by signal %d" +msgstr "" + +msgid "invalid exit code" +msgstr "" + +#, python-format +msgid "could not symlink to %r: %s" +msgstr "" + +#, python-format +msgid "invalid date: %r " +msgstr "" + +#, python-format +msgid "date exceeds 32 bits: %d" +msgstr "" + +#, python-format +msgid "impossible time zone offset: %d" +msgstr "" + +#, python-format +msgid "invalid day spec: %s" +msgstr "" + +#, python-format +msgid "%.0f GB" +msgstr "" + +#, python-format +msgid "%.1f GB" +msgstr "" + +#, python-format +msgid "%.2f GB" +msgstr "" + +#, python-format +msgid "%.0f MB" +msgstr "" + +#, python-format +msgid "%.1f MB" +msgstr "" + +#, python-format +msgid "%.2f MB" +msgstr "" + +#, python-format +msgid "%.0f KB" +msgstr "" + +#, python-format +msgid "%.1f KB" +msgstr "" + +#, python-format +msgid "%.2f KB" +msgstr "" + +#, python-format +msgid "%.0f bytes" +msgstr "" + +msgid "cannot verify bundle or remote repos" +msgstr "" + +msgid "interrupted" +msgstr "" + +#, python-format +msgid "empty or missing %s" +msgstr "" + +#, python-format +msgid "data length off by %d bytes" +msgstr "" + +#, python-format +msgid "index contains %d extra bytes" +msgstr "" + +#, python-format +msgid "warning: `%s' uses revlog format 1" +msgstr "" + +#, python-format +msgid "warning: `%s' uses revlog format 0" +msgstr "" + +#, python-format +msgid "rev %d point to %s changeset %d" +msgstr "" + +#, python-format +msgid " (expected %s)" +msgstr "" + +#, python-format +msgid "unknown parent 1 %s of %s" +msgstr "" + +#, python-format +msgid "unknown parent 2 %s of %s" +msgstr "" + +#, python-format +msgid "checking parents of %s" +msgstr "" + +#, python-format +msgid "duplicate revision %d (%d)" +msgstr "" + +#, python-format +msgid "repository uses revlog format %d\n" +msgstr "" + +msgid "checking changesets\n" +msgstr "" + +#, python-format +msgid "unpacking changeset %s" +msgstr "" + +msgid "checking manifests\n" +msgstr "" + +msgid "file without name in manifest" +msgstr "" + +#, python-format +msgid "reading manifest delta %s" +msgstr "" + +msgid "crosschecking files in changesets and manifests\n" +msgstr "" + +#, python-format +msgid "changeset refers to unknown manifest %s" +msgstr "" + +msgid "in changeset but not in manifest" +msgstr "" + +msgid "in manifest but not in changeset" +msgstr "" + +msgid "checking files\n" +msgstr "" + +#, python-format +msgid "cannot decode filename '%s'" +msgstr "" + +msgid "missing revlog!" +msgstr "" + +#, python-format +msgid "%s not in manifests" +msgstr "" + +#, python-format +msgid "unpacked size is %s, %s expected" +msgstr "" + +#, python-format +msgid "unpacking %s" +msgstr "" + +#, python-format +msgid "empty or missing copy source revlog %s:%s" +msgstr "" + +#, python-format +msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgstr "" + +#, python-format +msgid "checking rename of %s" +msgstr "" + +#, python-format +msgid "%s in manifests not found" +msgstr "" + +#, python-format +msgid "warning: orphan revlog '%s'" +msgstr "" + +#, python-format +msgid "%d files, %d changesets, %d total revisions\n" +msgstr "" + +#, python-format +msgid "%d warnings encountered!\n" +msgstr "" + +#, python-format +msgid "%d integrity errors encountered!\n" +msgstr "" + +#, python-format +msgid "(first damaged changeset appears to be %d)\n" +msgstr ""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/i18n/zh.po Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,9204 @@ +# +# Chinese (simplified) translation for Mercurial +# This file is distributed under the same license as Mercurial +# +# Copyright (C) 2009 the Mercurial team +# Dongsheng Song <dongsheng.song@gmail.com>, 2009 +# +# $Id: zh.po 1185 2009-02-17 15:10:31Z dongsheng.song $ +# +# Update with pot file: +# msgmerge --update zh.po hg.pot +# msgfmt --statistics -c zh.po +# +# Please test your translation before commit: +# python setup.py build_py -c -d . build_ext -i build_mo +# LC_ALL=zh_CN.UTF-8 ./hg +# +# Please format your translation before commit: +# msgcat --width=80 --sort-by-file -o zh_new.po zh.po +# mv -f zh_new.po zh.po +# +# Please remove '#: filename:line' lines before submit to hg: +# msgcat --width=80 --no-location -o zh_new.po zh.po +# mv -f zh_new.po zh.po +# +# Dictionary: +# blame 追溯 +# branch 分支 +# changes 改变 +# changeset 改变集 +# checkout 检出 +# remove 移除(从版本库删除) +# delete 删除(只从文件系统删除) +# patchset 补丁集 +# pushing to 推到 +# pulling from 拉自 +# rename 改名 +# repository 版本库 +# revert 恢复 +# revision 版本 +# tag 标签 +# tip 顶点 +# undo 撤销 +# unversioned 未版本控制 +# versioned 受版本控制 +# working copy 工作副本 +# +msgid "" +msgstr "" +"Project-Id-Version: Mercurial 1.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-17 21:43+0800\n" +"PO-Revision-Date: 2009-02-17 23:05+0800\n" +"Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" +"Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Poedit-Language: Chinese\n" +"X-Poedit-Country: CHINA\n" + +#, python-format +msgid " (default: %s)" +msgstr " (默认: %s)" + +msgid "OPTIONS" +msgstr "选项" + +msgid "COMMANDS" +msgstr "命令" + +msgid " options:\n" +msgstr " 选项:\n" + +#, python-format +msgid "" +" aliases: %s\n" +"\n" +msgstr "" +" 别名: %s\n" +"\n" + +msgid "return tuple of (match function, list enabled)." +msgstr "返回 tuple (匹配函数，启用列表)" + +#, python-format +msgid "acl: %s not enabled\n" +msgstr "acl: 未启用 %s\n" + +#, python-format +msgid "acl: %s enabled, %d entries for user %s\n" +msgstr "acl: 已启用 %s, %d 项，用户 %s\n" + +#, python-format +msgid "config error - hook type \"%s\" cannot stop incoming changesets" +msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的改变集" + +#, python-format +msgid "acl: changes have source \"%s\" - skipping\n" +msgstr "acl: 改变源 \"%s\" - 跳过\n" + +#, python-format +msgid "acl: user %s denied on %s\n" +msgstr "acl: 用户 %s 被拒绝访问 %s\n" + +#, python-format +msgid "acl: access denied for changeset %s" +msgstr "acl: 拒绝访问改变集 %s" + +#, python-format +msgid "acl: user %s not allowed on %s\n" +msgstr "acl: 用户 %s 被拒绝访问 %s\n" + +#, python-format +msgid "acl: allowing changeset %s\n" +msgstr "acl: 允许改变集 %s\n" + +msgid "" +"allow user-defined command aliases\n" +"\n" +"To use, create entries in your hgrc of the form\n" +"\n" +"[alias]\n" +"mycmd = cmd --args\n" +msgstr "" +"允许用户自定义命令的别名\n" +"\n" +"要使用别名，在你的 hgrc 中创建如下格式的条目:\n" +"\n" +"[alias]\n" +"mycmd = cmd --args\n" + +msgid "" +"defer command lookup until needed, so that extensions loaded\n" +" after alias can be aliased" +msgstr "查找命令会推迟到需要时，所以可以在定义别名后加载模块" + +#, python-format +msgid "*** [alias] %s: command %s is unknown" +msgstr "*** [alias] %s: 未知命令 %s" + +#, python-format +msgid "*** [alias] %s: command %s is ambiguous" +msgstr "*** [alias] %s: 不明确的命令 %s" + +#, python-format +msgid "*** [alias] %s: circular dependency on %s" +msgstr "*** [alias] %s: 循环依赖于 %s" + +#, python-format +msgid "*** [alias] %s: no definition\n" +msgstr "*** [alias] %s: 无定义\n" + +msgid "" +"mercurial bookmarks\n" +"\n" +"Mercurial bookmarks are local moveable pointers to changesets. Every\n" +"bookmark points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it, the\n" +"bookmark is forwarded to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup (e.g. hg\n" +"merge, hg update).\n" +"\n" +"The bookmark extension offers the possiblity to have a more git-like " +"experience\n" +"by adding the following configuration option to your .hgrc:\n" +"\n" +"[bookmarks]\n" +"track.current = True\n" +"\n" +"This will cause bookmarks to track the bookmark that you are currently on, " +"and\n" +"just updates it. This is similar to git's approach of branching.\n" +msgstr "" + +msgid "" +"Parse .hg/bookmarks file and return a dictionary\n" +"\n" +" Bookmarks are stored as {HASH}\\s{NAME}\n" +" (localtags format) values\n" +" in the .hg/bookmarks file. They are read by the parse() method and\n" +" returned as a dictionary with name => hash values.\n" +"\n" +" The parsed dictionary is cached until a write() operation is done.\n" +" " +msgstr "" + +msgid "" +"Write bookmarks\n" +"\n" +" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" +" in a format equal to those of localtags.\n" +"\n" +" We also store a backup of the previous state in undo.bookmarks that\n" +" can be copied back on rollback.\n" +" " +msgstr "" + +msgid "" +"Get the current bookmark\n" +"\n" +" If we use gittishsh branches we have a current bookmark that\n" +" we are on. This function returns the name of the bookmark. It\n" +" is stored in .hg/bookmarks.current\n" +" " +msgstr "" + +msgid "" +"Set the name of the bookmark that we are currently on\n" +"\n" +" Set the name of the bookmark that we are on (hg update <bookmark>).\n" +" The name is recoreded in .hg/bookmarks.current\n" +" " +msgstr "" + +msgid "" +"mercurial bookmarks\n" +"\n" +" Bookmarks are pointers to certain commits that move when\n" +" commiting. Bookmarks are local. They can be renamed, copied and\n" +" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n" +" update' to update to a given bookmark.\n" +"\n" +" You can use 'hg bookmark NAME' to set a bookmark on the current\n" +" tip with the given name. If you specify a revision using -r REV\n" +" (where REV may be an existing bookmark), the bookmark is set to\n" +" that revision.\n" +" " +msgstr "" + +msgid "a bookmark of this name does not exist" +msgstr "" + +msgid "a bookmark of the same name already exists" +msgstr "" + +msgid "new bookmark name required" +msgstr "" + +msgid "bookmark name required" +msgstr "" + +msgid "bookmark name cannot contain newlines" +msgstr "" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "" + +msgid "" +"Strip bookmarks if revisions are stripped using\n" +" the mercurial.strip method. This usually happens during\n" +" qpush and qpop" +msgstr "" + +msgid "" +"Add a revision to the repository and\n" +" move the bookmark" +msgstr "" + +msgid "Merge bookmarks with normal tags" +msgstr "" + +msgid "" +"Set the current bookmark\n" +"\n" +" If the user updates to a bookmark we update the .hg/bookmarks.current\n" +" file.\n" +" " +msgstr "" + +msgid "force" +msgstr "强制" + +msgid "revision" +msgstr "版本" + +msgid "delete a given bookmark" +msgstr "删除指定书签" + +msgid "rename a given bookmark" +msgstr "改名指定书签" + +msgid "hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]" +msgstr "" + +msgid "" +"Bugzilla integration\n" +"\n" +"This hook extension adds comments on bugs in Bugzilla when changesets\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n" +"status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla installations\n" +"using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification emails.\n" +"That script changes between Bugzilla versions; the 'processmail' script used\n" +"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" +"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " +"user\n" +"pushing the change; you will need to ensure the Bugzilla install file\n" +"permissions are set appropriately.\n" +"\n" +"Configuring the extension:\n" +"\n" +" [bugzilla]\n" +" host Hostname of the MySQL server holding the Bugzilla database.\n" +" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +" user Username to use to access MySQL server. Default 'bugs'.\n" +" password Password to use to access MySQL server.\n" +" timeout Database connection timeout (seconds). Default 5.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and\n" +" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" +" versions prior to 2.18.\n" +" bzuser Fallback Bugzilla user name to record comments with, if\n" +" changeset committer cannot be found as a Bugzilla user.\n" +" bzdir Bugzilla install directory. Used by default notify.\n" +" Default '/var/www/html/bugzilla'.\n" +" notify The command to run to get Bugzilla to send bug change\n" +" notification emails. Substitutes from a map with 3 keys,\n" +" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla email).\n" +" Default depends on version; from 2.18 it is\n" +" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)" +"s\".\n" +" regexp Regular expression to match bug IDs in changeset commit " +"message.\n" +" Must contain one \"()\" group. The default expression matches\n" +" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" +" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations thereof.\n" +" Matching is case insensitive.\n" +" style The style file to use when formatting comments.\n" +" template Template to use when formatting comments. Overrides\n" +" style if specified. In addition to the usual Mercurial\n" +" keywords, the extension specifies:\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial " +"repository.\n" +" {webroot} Stripped pathname of the Mercurial " +"repository.\n" +" {hgweb} Base URL for browsing Mercurial repositories.\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +" strip The number of slashes to strip from the front of {root}\n" +" to produce {webroot}. Default 0.\n" +" usermap Path of file containing Mercurial committer ID to Bugzilla " +"user\n" +" ID mappings. If specified, the file should contain one " +"mapping\n" +" per line, \"committer\"=\"Bugzilla user\". See also the\n" +" [usermap] section.\n" +"\n" +" [usermap]\n" +" Any entries in this section specify mappings of Mercurial committer ID\n" +" to Bugzilla user ID. See also [bugzilla].usermap.\n" +" \"committer\"=\"Bugzilla user\"\n" +"\n" +" [web]\n" +" baseurl Base URL for browsing Mercurial repositories. Reference from\n" +" templates as {hgweb}.\n" +"\n" +"Activating the extension:\n" +"\n" +" [extensions]\n" +" hgext.bugzilla =\n" +"\n" +" [hooks]\n" +" # run bugzilla hook on every change pulled or pushed in here\n" +" incoming.bugzilla = python:hgext.bugzilla.hook\n" +"\n" +"Example configuration:\n" +"\n" +"This example configuration is for a collection of Mercurial repositories\n" +"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" +"/opt/bugzilla-3.2.\n" +"\n" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" +"rev/{node|short}\\n\\n{desc}\\n\n" +" strip=5\n" +"\n" +" [web]\n" +" baseurl=http://dev.domain.com/hg\n" +"\n" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com\n" +"\n" +"Commits add a comment to the Bugzilla bug record of the form:\n" +"\n" +" Changeset 3b16791d6642 in repository-name.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" +"\n" +" Changeset commit comment. Bug 1234.\n" +msgstr "" + +msgid "support for bugzilla version 2.16." +msgstr "支持 bugzilla 2.16。" + +#, python-format +msgid "connecting to %s:%s as %s, password %s\n" +msgstr "连接到 %s:%s as %s，密码 %s\n" + +msgid "run a query." +msgstr "运行查询。" + +#, python-format +msgid "query: %s %s\n" +msgstr "查询: %s %s\n" + +#, python-format +msgid "failed query: %s %s\n" +msgstr "查询失败: %s %s\n" + +msgid "get identity of longdesc field" +msgstr "" + +msgid "unknown database schema" +msgstr "未知的数据库方案" + +msgid "filter not-existing bug ids from list." +msgstr "从列表中过滤不存在的问题标识。" + +msgid "filter bug ids from list that already refer to this changeset." +msgstr "" + +#, python-format +msgid "bug %d already knows about changeset %s\n" +msgstr "" + +msgid "tell bugzilla to send mail." +msgstr "" + +msgid "telling bugzilla to send mail:\n" +msgstr "" + +#, python-format +msgid " bug %s\n" +msgstr "" + +#, python-format +msgid "running notify command %s\n" +msgstr "" + +#, python-format +msgid "bugzilla notify command %s" +msgstr "" + +msgid "done\n" +msgstr "完成\n" + +msgid "look up numeric bugzilla user id." +msgstr "" + +#, python-format +msgid "looking up user %s\n" +msgstr "" + +msgid "map name of committer to bugzilla user name." +msgstr "" + +msgid "" +"see if committer is a registered bugzilla user. Return\n" +" bugzilla username and userid if so. If not, return default\n" +" bugzilla username and userid." +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s" +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s or %s" +msgstr "" + +msgid "" +"add comment to bug. try adding comment as committer of\n" +" changeset, otherwise as default bugzilla user." +msgstr "" + +msgid "support for bugzilla 2.18 series." +msgstr "" + +msgid "support for bugzilla 3.0 series." +msgstr "" + +msgid "" +"return object that knows how to talk to bugzilla version in\n" +" use." +msgstr "" + +#, python-format +msgid "bugzilla version %s not supported" +msgstr "" + +msgid "" +"find valid bug ids that are referred to in changeset\n" +" comments and that do not already have references to this\n" +" changeset." +msgstr "" + +msgid "update bugzilla bug with reference to changeset." +msgstr "" + +msgid "" +"strip leading prefix of repo root and turn into\n" +" url-safe path." +msgstr "" + +msgid "" +"changeset {node|short} in repo {root} refers to bug {bug}.\n" +"details:\n" +"\t{desc|tabindent}" +msgstr "" + +msgid "" +"add comment to bugzilla for each changeset that refers to a\n" +" bugzilla bug id. only add a comment once per bug, so same change\n" +" seen multiple times does not fill bug with duplicate data." +msgstr "" + +#, python-format +msgid "python mysql support not available: %s" +msgstr "" + +#, python-format +msgid "hook type %s does not pass a changeset id" +msgstr "" + +#, python-format +msgid "database error: %s" +msgstr "" + +msgid "" +"show the children of the given or working dir revision\n" +"\n" +" Print the children of the working directory's revisions.\n" +" If a revision is given via --rev, the children of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (after the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" + +msgid "show children of the specified rev" +msgstr "" + +msgid "hg children [-r REV] [FILE]" +msgstr "" + +msgid "command to show certain statistics about revision history" +msgstr "" + +msgid "Calculate stats" +msgstr "" + +#, python-format +msgid "Revision %d is a merge, ignoring...\n" +msgstr "" + +#, python-format +msgid "\rgenerating stats: %d%%" +msgstr "" + +msgid "" +"graph count of revisions grouped by template\n" +"\n" +" Will graph count of changed lines or revisions grouped by template or\n" +" alternatively by date, if dateformat is used. In this case it will " +"override\n" +" template.\n" +"\n" +" By default statistics are counted for number of changed lines.\n" +"\n" +" Examples:\n" +"\n" +" # display count of changed lines for every committer\n" +" hg churn -t '{author|email}'\n" +"\n" +" # display daily activity graph\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # display activity of developers by month\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # display count of lines changed in every year\n" +" hg churn -f '%Y' -s\n" +"\n" +" The map file format used to specify aliases is fairly simple:\n" +"\n" +" <alias email> <actual email>" +msgstr "" + +#, python-format +msgid "assuming %i character terminal\n" +msgstr "" + +msgid "count rate for the specified revision or range" +msgstr "" + +msgid "count rate for revs matching date spec" +msgstr "" + +msgid "template to group changesets" +msgstr "" + +msgid "strftime-compatible format for grouping by date" +msgstr "" + +msgid "count rate by number of changesets" +msgstr "" + +msgid "sort by key (default: sort by count)" +msgstr "" + +msgid "file with email aliases" +msgstr "" + +msgid "show progress" +msgstr "" + +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" +msgstr "" + +msgid "" +"add color output to status, qseries, and diff-related commands\n" +"\n" +"This extension modifies the status command to add color to its output to\n" +"reflect file status, the qseries command to add color to reflect patch " +"status\n" +"(applied, unapplied, missing), and to diff-related commands to highlight\n" +"additions, removals, diff headers, and trailing whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are also\n" +"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" +"ANSI escape codes). This module also provides the render_text function,\n" +"which can be used to add effects to any text.\n" +"\n" +"To enable this extension, add this to your .hgrc file:\n" +"[extensions]\n" +"color =\n" +"\n" +"Default effects my be overriden from the .hgrc file:\n" +"\n" +"[color]\n" +"status.modified = blue bold underline red_background\n" +"status.added = green bold\n" +"status.removed = red bold blue_background\n" +"status.deleted = cyan bold underline\n" +"status.unknown = magenta bold underline\n" +"status.ignored = black bold\n" +"\n" +"# 'none' turns off all effects\n" +"status.clean = none\n" +"status.copied = none\n" +"\n" +"qseries.applied = blue bold underline\n" +"qseries.unapplied = black bold\n" +"qseries.missing = red bold\n" +"\n" +"diff.diffline = bold\n" +"diff.extended = cyan bold\n" +"diff.file_a = red bold\n" +"diff.file_b = green bold\n" +"diff.hunk = magenta\n" +"diff.deleted = red\n" +"diff.inserted = green\n" +"diff.changed = white\n" +"diff.trailingwhitespace = bold red_background\n" +msgstr "" + +msgid "Wrap text in commands to turn on each effect." +msgstr "" + +msgid "run the status command with colored output" +msgstr "" + +msgid "run the qseries command with colored output" +msgstr "" + +msgid "wrap ui.write for colored diff output" +msgstr "" + +msgid "wrap cmdutil.changeset_printer.showpatch with colored output" +msgstr "" + +msgid "run the diff command with colored output" +msgstr "" + +msgid "Initialize the extension." +msgstr "" + +msgid "patch in command to command table and load effect map" +msgstr "" + +msgid "when to colorize (always, auto, or never)" +msgstr "" + +msgid "don't colorize output" +msgstr "" + +msgid "converting foreign VCS repositories to Mercurial" +msgstr "" + +msgid "" +"convert a foreign SCM repository to a Mercurial one.\n" +"\n" +" Accepted source formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - CVS [cvs]\n" +" - Darcs [darcs]\n" +" - git [git]\n" +" - Subversion [svn]\n" +" - Monotone [mtn]\n" +" - GNU Arch [gnuarch]\n" +" - Bazaar [bzr]\n" +"\n" +" Accepted destination formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - Subversion [svn] (history on branches is not preserved)\n" +"\n" +" If no revision is given, all revisions will be converted. Otherwise,\n" +" convert will only import up to the named revision (given in a format\n" +" understood by the source).\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source with '-hg' appended. If the destination\n" +" repository doesn't exist, it will be created.\n" +"\n" +" If <REVMAP> isn't given, it will be put in a default location\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" +" file that maps each source commit ID to the destination ID for\n" +" that revision, like so:\n" +" <source ID> <destination ID>\n" +"\n" +" If the file doesn't exist, it's automatically created. It's updated\n" +" on each commit copied, so convert-repo can be interrupted and can\n" +" be run repeatedly to copy new commits.\n" +"\n" +" The [username mapping] file is a simple text file that maps each source\n" +" commit author to a destination commit author. It is handy for source " +"SCMs\n" +" that use unix logins to identify authors (eg: CVS). One line per author\n" +" mapping and the line format is:\n" +" srcauthor=whatever string you want\n" +"\n" +" The filemap is a file that allows filtering and remapping of files\n" +" and directories. Comment lines start with '#'. Each line can\n" +" contain one of the following directives:\n" +"\n" +" include path/to/file\n" +"\n" +" exclude path/to/file\n" +"\n" +" rename from/file to/file\n" +"\n" +" The 'include' directive causes a file, or all files under a\n" +" directory, to be included in the destination repository, and the\n" +" exclusion of all other files and dirs not explicitely included.\n" +" The 'exclude' directive causes files or directories to be omitted.\n" +" The 'rename' directive renames a file or directory. To rename from a\n" +" subdirectory into the root of the repository, use '.' as the path to\n" +" rename to.\n" +"\n" +" The splicemap is a file that allows insertion of synthetic\n" +" history, letting you specify the parents of a revision. This is\n" +" useful if you want to e.g. give a Subversion merge two parents, or\n" +" graft two disconnected series of history together. Each entry\n" +" contains a key, followed by a space, followed by one or two\n" +" values, separated by spaces. The key is the revision ID in the\n" +" source revision control system whose parents should be modified\n" +" (same format as a key in .hg/shamap). The values are the revision\n" +" IDs (in either the source or destination revision control system)\n" +" that should be used as the new parents for that node.\n" +"\n" +" Mercurial Source\n" +" -----------------\n" +"\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" +" ignore integrity errors when reading. Use it to fix Mercurial\n" +" repositories with missing revlogs, by converting from and to\n" +" Mercurial.\n" +" --config convert.hg.saverev=True (boolean)\n" +" allow target to preserve source revision ID\n" +" --config convert.hg.startrev=0 (hg revision identifier)\n" +" convert start revision and its descendants\n" +"\n" +" CVS Source\n" +" ----------\n" +"\n" +" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" +" to indicate the starting point of what will be converted. Direct\n" +" access to the repository files is not needed, unless of course\n" +" the repository is :local:. The conversion uses the top level\n" +" directory in the sandbox to find the CVS repository, and then uses\n" +" CVS rlog commands to find files to convert. This means that unless\n" +" a filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganisation in the CVS\n" +" sandbox is ignored.\n" +"\n" +" Because CVS does not have changesets, it is necessary to collect\n" +" individual commits to CVS and merge them into changesets. CVS\n" +" source uses its internal changeset merging code by default but can\n" +" be configured to call the external 'cvsps' program by setting:\n" +" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +" This is a legacy option and may be removed in future.\n" +"\n" +" The options shown are the defaults.\n" +"\n" +" Internal cvsps is selected by setting\n" +" --config convert.cvsps=builtin\n" +" and has a few more configurable options:\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed between\n" +" commits with identical user and log message in a single\n" +" changeset. When very large files were checked in as part\n" +" of a changeset then the default may not be long enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" insert a dummy revision merging the branch on which this log\n" +" message occurs to the branch indicated in the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" add the most recent revision on the branch indicated in the\n" +" regex as the second parent of the changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" +" merging code to be run without doing a conversion. Its parameters and\n" +" output are similar to that of cvsps 2.1.\n" +"\n" +" Subversion Source\n" +" -----------------\n" +"\n" +" Subversion source detects classical trunk/branches/tags layouts.\n" +" By default, the supplied \"svn://repo/path/\" source URL is\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists\n" +" it replaces the default branch. If \"svn://repo/path/branches\"\n" +" exists, its subdirectories are listed as possible branches. If\n" +" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" +" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" +" can be overriden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable\n" +" autodetection.\n" +"\n" +" --config convert.svn.branches=branches (directory name)\n" +" specify the directory containing branches\n" +" --config convert.svn.tags=tags (directory name)\n" +" specify the directory containing tags\n" +" --config convert.svn.trunk=trunk (directory name)\n" +" specify the name of the trunk branch\n" +"\n" +" Source history can be retrieved starting at a specific revision,\n" +" instead of being integrally converted. Only single branch\n" +" conversions are supported.\n" +"\n" +" --config convert.svn.startrev=0 (svn revision number)\n" +" specify start Subversion revision.\n" +"\n" +" Mercurial Destination\n" +" ---------------------\n" +"\n" +" --config convert.hg.clonebranches=False (boolean)\n" +" dispatch source branches in separate clones.\n" +" --config convert.hg.tagsbranch=default (branch name)\n" +" tag revisions branch name\n" +" --config convert.hg.usebranchnames=True (boolean)\n" +" preserve branch names\n" +"\n" +" " +msgstr "" + +msgid "" +"create changeset information from CVS\n" +"\n" +" This command is intended as a debugging tool for the CVS to Mercurial\n" +" converter, and can be used as a direct replacement for cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" +" directory) in the CVS repository, and converts the log to a series of\n" +" changesets based on matching commit log entries and dates." +msgstr "" + +msgid "username mapping filename" +msgstr "" + +msgid "destination repository type" +msgstr "" + +msgid "remap file names using contents of file" +msgstr "" + +msgid "import up to target revision REV" +msgstr "" + +msgid "source repository type" +msgstr "" + +msgid "splice synthesized history into place" +msgstr "" + +msgid "try to sort changesets by date" +msgstr "" + +msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" +msgstr "" + +msgid "only return changes on specified branches" +msgstr "" + +msgid "prefix to remove from file names" +msgstr "" + +msgid "only return changes after or between specified tags" +msgstr "" + +msgid "update cvs log cache" +msgstr "" + +msgid "create new cvs log cache" +msgstr "" + +msgid "set commit time fuzz in seconds" +msgstr "" + +msgid "specify cvsroot" +msgstr "" + +msgid "show parent changesets" +msgstr "" + +msgid "show current changeset in ancestor branches" +msgstr "" + +msgid "ignored for compatibility" +msgstr "" + +msgid "hg debugcvsps [OPTION]... [PATH]..." +msgstr "" + +#, python-format +msgid "%s is not a valid revision in current branch" +msgstr "" + +#, python-format +msgid "%s is not available in %s anymore" +msgstr "" + +#, python-format +msgid "cannot find required \"%s\" tool" +msgstr "" + +#, python-format +msgid "running: %s\n" +msgstr "" + +#, python-format +msgid "%s error:\n" +msgstr "" + +#, python-format +msgid "%s %s" +msgstr "" + +#, python-format +msgid "could not open map file %r: %s" +msgstr "" + +#, python-format +msgid "%s: missing or unsupported repository" +msgstr "" + +#, python-format +msgid "convert: %s\n" +msgstr "" + +#, python-format +msgid "%s: unknown repository type" +msgstr "" + +#, python-format +msgid "cycle detected between %s and %s" +msgstr "" + +msgid "not all revisions were sorted" +msgstr "" + +#, python-format +msgid "Writing author map file %s\n" +msgstr "" + +#, python-format +msgid "Overriding mapping for author %s, was %s, will be %s\n" +msgstr "" + +#, python-format +msgid "mapping author %s to %s\n" +msgstr "" + +#, python-format +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "" + +#, python-format +msgid "spliced in %s as parents of %s\n" +msgstr "" + +msgid "scanning source...\n" +msgstr "" + +msgid "sorting...\n" +msgstr "" + +msgid "converting...\n" +msgstr "" + +#, python-format +msgid "source: %s\n" +msgstr "" + +#, python-format +msgid "assuming destination %s\n" +msgstr "" + +#, python-format +msgid "revision %s is not a patchset number or date" +msgstr "" + +msgid "using builtin cvsps\n" +msgstr "" + +#, python-format +msgid "connecting to %s\n" +msgstr "" + +msgid "CVS pserver authentication failed" +msgstr "" + +msgid "server sucks" +msgstr "" + +#, python-format +msgid "%d bytes missing from remote file" +msgstr "" + +#, python-format +msgid "cvs server: %s\n" +msgstr "" + +#, python-format +msgid "unknown CVS response: %s" +msgstr "" + +msgid "collecting CVS rlog\n" +msgstr "" + +#, python-format +msgid "reading cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "cache has %d log entries\n" +msgstr "" + +#, python-format +msgid "error reading cache: %r\n" +msgstr "" + +#, python-format +msgid "running %s\n" +msgstr "" + +#, python-format +msgid "prefix=%r directory=%r root=%r\n" +msgstr "" + +msgid "RCS file must be followed by working file" +msgstr "" + +msgid "must have at least some revisions" +msgstr "" + +msgid "expected revision number" +msgstr "" + +msgid "revision must be followed by date line" +msgstr "" + +#, python-format +msgid "writing cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "%d log entries\n" +msgstr "" + +msgid "creating changesets\n" +msgstr "" + +#, python-format +msgid "%d changeset entries\n" +msgstr "" + +msgid "Python ElementTree module is not available" +msgstr "" + +#, python-format +msgid "cleaning up %s\n" +msgstr "" + +msgid "internal calling inconsistency" +msgstr "" + +msgid "errors in filemap" +msgstr "" + +#, python-format +msgid "%s:%d: %r already in %s list\n" +msgstr "" + +#, python-format +msgid "%s:%d: unknown directive %r\n" +msgstr "" + +msgid "source repository doesn't support --filemap" +msgstr "" + +#, python-format +msgid "%s does not look like a GNU Arch repo" +msgstr "" + +msgid "cannot find a GNU Arch tool" +msgstr "" + +#, python-format +msgid "analyzing tree version %s...\n" +msgstr "" + +#, python-format +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "" + +#, python-format +msgid "applying revision %s...\n" +msgstr "" + +#, python-format +msgid "computing changeset between %s and %s...\n" +msgstr "" + +#, python-format +msgid "obtaining revision %s...\n" +msgstr "" + +#, python-format +msgid "analysing revision %s...\n" +msgstr "" + +#, python-format +msgid "could not parse cat-log of %s" +msgstr "" + +#, python-format +msgid "%s is not a local Mercurial repo" +msgstr "%s 不是本地的水银版本库" + +#, python-format +msgid "initializing destination %s repository\n" +msgstr "初始化目标版本库 %s\n" + +msgid "run hg sink pre-conversion action\n" +msgstr "执行动作 hg sink pre-conversion\n" + +msgid "run hg sink post-conversion action\n" +msgstr "执行动作 hg sink post-conversion action\n" + +#, python-format +msgid "pulling from %s into %s\n" +msgstr "自 %s 拉到 %s\n" + +msgid "updating tags\n" +msgstr "正在更新标签\n" + +#, python-format +msgid "%s is not a valid start revision" +msgstr "%s 不是有效的开始版本" + +#, python-format +msgid "ignoring: %s\n" +msgstr "忽略: %s\n" + +msgid "run hg source pre-conversion action\n" +msgstr "执行动作 hg source pre-conversion\n" + +msgid "run hg source post-conversion action\n" +msgstr "执行动作 hg source post-conversion\n" + +#, python-format +msgid "%s does not look like a monotone repo" +msgstr "%s 不像是单纯的 monotone 版本库" + +#, python-format +msgid "copying file in renamed dir from '%s' to '%s'" +msgstr "从已改名的目录 '%s' 复制文件到 '%s'" + +msgid "Subversion python bindings could not be loaded" +msgstr "不能加载 svn 的 python 绑定" + +#, python-format +msgid "Subversion python bindings %d.%d found, 1.4 or later required" +msgstr "发现 svn 的 python 绑定版本 %d.%d，需要 1.4 或更新的版本" + +msgid "Subversion python bindings are too old, 1.4 or later required" +msgstr "svn 的 python 绑定太旧，需要 1.4 或更新的版本" + +#, python-format +msgid "svn: revision %s is not an integer" +msgstr "svn: 版本 %s 不是整数" + +#, python-format +msgid "svn: start revision %s is not an integer" +msgstr "svn: 开始版本 %s 不是整数" + +#, python-format +msgid "no revision found in module %s" +msgstr "没有在模块 %s 中发现版本" + +#, python-format +msgid "expected %s to be at %r, but not found" +msgstr "期望 %s 位于 %r，但是没有发现" + +#, python-format +msgid "found %s at %r\n" +msgstr "发现 %s 位于 %r\n" + +#, python-format +msgid "ignoring empty branch %s\n" +msgstr "忽略空的分支 %s\n" + +#, python-format +msgid "found branch %s at %d\n" +msgstr "发现分支 %s 位于 %d\n" + +msgid "svn: start revision is not supported with with more than one branch" +msgstr "svn: 在给出多于一个分支时不支持开始版本" + +#, python-format +msgid "svn: no revision found after start revision %d" +msgstr "svn: 在开始版本 %d 之后没有版本" + +#, python-format +msgid "no tags found at revision %d\n" +msgstr "在版本 %d 没有发现标签\n" + +#, python-format +msgid "ignoring foreign branch %r\n" +msgstr "忽略外部分支 %r\n" + +#, python-format +msgid "%s not found up to revision %d" +msgstr "没有发现 %s，一直到版本 %d" + +#, python-format +msgid "branch renamed from %s to %s at %d\n" +msgstr "分支从 %s 改名为 %s，在 %d\n" + +#, python-format +msgid "reparent to %s\n" +msgstr "" + +#, python-format +msgid "copied to %s from %s@%s\n" +msgstr "复制到 %s，自 %s@%s\n" + +#, python-format +msgid "gone from %s\n" +msgstr "离开 %s\n" + +#, python-format +msgid "found parent directory %s\n" +msgstr "发现父目录 %s\n" + +#, python-format +msgid "base, entry %s %s\n" +msgstr "基本，入口 %s %s\n" + +msgid "munge-o-matic\n" +msgstr "" + +#, python-format +msgid "info: %s %s %s %s\n" +msgstr "信息: %s %s %s %s\n" + +#, python-format +msgid "unknown path in revision %d: %s\n" +msgstr "版本 %d 有未知路径: %s\n" + +#, python-format +msgid "mark %s came from %s:%d\n" +msgstr "标记 %s 来自 %s:%d\n" + +#, python-format +msgid "parsing revision %d (%d changes)\n" +msgstr "解析版本 %d (%d 个改变)\n" + +#, python-format +msgid "found parent of branch %s at %d: %s\n" +msgstr "发现分支 %s 的父亲，在 %d: %s\n" + +msgid "no copyfrom path, don't know what to do.\n" +msgstr "没有 copyfrom 路径，不知道该怎么办。\n" + +#, python-format +msgid "fetching revision log for \"%s\" from %d to %d\n" +msgstr "为 \"%s\" 获取版本日志，自 %d 到 %d\n" + +#, python-format +msgid "skipping blacklisted revision %d\n" +msgstr "忽略黑名单版本 %d\n" + +#, python-format +msgid "revision %d has no entries\n" +msgstr "版本 %d 没有入口\n" + +#, python-format +msgid "svn: branch has no revision %s" +msgstr "svn: 分支没有版本 %s" + +#, python-format +msgid "%r is not under %r, ignoring\n" +msgstr "%r 不在 %r 之下，忽略之\n" + +#, python-format +msgid "initializing svn repo %r\n" +msgstr "初始化 svn 版本库 %r\n" + +#, python-format +msgid "initializing svn wc %r\n" +msgstr "初始化 svn 工作副本 %r\n" + +msgid "unexpected svn output:\n" +msgstr "意外的 svn 输出:\n" + +msgid "unable to cope with svn output" +msgstr "不能处理 svn 的输出" + +msgid "XXX TAGS NOT IMPLEMENTED YET\n" +msgstr "" + +msgid "" +"\n" +"The `extdiff' Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working dir. The external diff\n" +"programs are called with a configurable set of options and two\n" +"non-option arguments: paths to directories containing snapshots of\n" +"files to compare.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.extdiff =\n" +"\n" +"The `extdiff' extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"\n" +" [extdiff]\n" +" # add new command that runs GNU diff(1) in 'context diff' mode\n" +" cdiff = gdiff -Nprc5\n" +" ## or the old way:\n" +" #cmd.cdiff = gdiff\n" +" #opts.cdiff = -Nprc5\n" +"\n" +" # add new command called vdiff, runs kdiff3\n" +" vdiff = kdiff3\n" +"\n" +" # add new command called meld, runs meld (no need to name twice)\n" +" meld =\n" +"\n" +" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" +" #(see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" +" # your .vimrc\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" +"\n" +"You can use -I/-X and list of file or directory names like normal\n" +"\"hg diff\" command. The `extdiff' extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" +msgstr "" + +msgid "snapshot files as of some revision" +msgstr "" + +#, python-format +msgid "making snapshot of %d files from rev %s\n" +msgstr "" + +msgid "" +"snapshot files from working directory.\n" +" if not using snapshot, -I/-X does not work and recursive diff\n" +" in tools like kdiff3 and meld displays too many files." +msgstr "" + +#, python-format +msgid "making snapshot of %d files from working dir\n" +msgstr "" + +msgid "" +"Do the actuall diff:\n" +"\n" +" - copy to a temp structure if diffing 2 internal revisions\n" +" - copy to a temp structure if diffing working revision with\n" +" another one and more than 1 file is changed\n" +" - just invoke the diff for a single file in the working dir\n" +" " +msgstr "" + +msgid "cannot specify --rev and --change at the same time" +msgstr "不能同时指定 '--rev' 和 '--change'" + +#, python-format +msgid "running %r in %s\n" +msgstr "" + +#, python-format +msgid "file changed while diffing. Overwriting: %s (src: %s)\n" +msgstr "" + +msgid "cleaning up temp directory\n" +msgstr "" + +msgid "" +"use external program to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using\n" +" an external program. The default program used is diff, with\n" +" default options \"-Npru\".\n" +"\n" +" To select a different program, use the -p option. The program\n" +" will be passed the names of two directories to compare. To pass\n" +" additional options to the program, use the -o option. These will\n" +" be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are\n" +" shown between those revisions. If only one revision is\n" +" specified then that revision is compared to the working\n" +" directory, and, when no revisions are specified, the\n" +" working directory files are compared to its parent." +msgstr "" + +msgid "comparison program to run" +msgstr "" + +msgid "pass option to comparison program" +msgstr "" + +msgid "change made by revision" +msgstr "此版本的修改" + +msgid "hg extdiff [OPT]... [FILE]..." +msgstr "" + +msgid "use closure to save diff command to use" +msgstr "" + +#, python-format +msgid "hg %s [OPTION]... [FILE]..." +msgstr "" + +msgid "pulling, updating and merging in one command" +msgstr "" + +msgid "" +"pull changes from a remote repository, merge new changes if needed.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository.\n" +"\n" +" If the pulled changes add a new branch head, the head is automatically\n" +" merged, and the result of the merge is committed. Otherwise, the\n" +" working directory is updated to include the new changes.\n" +"\n" +" When a merge occurs, the newly pulled changes are assumed to be\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" +" order, use --switch-parent.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" + +msgid "outstanding uncommitted merge" +msgstr "" + +msgid "outstanding uncommitted changes" +msgstr "" + +msgid "working directory is missing some files" +msgstr "" + +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" + +#, python-format +msgid "pulling from %s\n" +msgstr "正在拉自 %s\n" + +msgid "fetch -r doesn't work for remote repositories yet" +msgstr "" + +#, python-format +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" +msgstr "" + +#, python-format +msgid "updating to %d:%s\n" +msgstr "" + +#, python-format +msgid "merging with %d:%s\n" +msgstr "" + +#, python-format +msgid "Automated merge with %s" +msgstr "" + +#, python-format +msgid "new changeset %d:%s merges remote changes with local\n" +msgstr "新修改集 '%d:%s' 将远程修改与本地合并\n" + +msgid "a specific revision you would like to pull" +msgstr "指定取得的版本" + +msgid "edit commit message" +msgstr "编辑提交日志" + +msgid "edit commit message (DEPRECATED)" +msgstr "编辑提交日志(不赞成)" + +msgid "switch parents when merging" +msgstr "当合并时切换父亲" + +msgid "hg fetch [SOURCE]" +msgstr "" + +msgid " returns of the good and bad signatures" +msgstr "" + +msgid "error while verifying signature" +msgstr "" + +msgid "create a new gpg instance" +msgstr "" + +msgid "" +"\n" +" walk over every sigs, yields a couple\n" +" ((node, version, sig), (filename, linenumber))\n" +" " +msgstr "" + +msgid "get the keys who signed a data" +msgstr "" + +#, python-format +msgid "%s Bad signature from \"%s\"\n" +msgstr "" + +#, python-format +msgid "%s Note: Signature has expired (signed by: \"%s\")\n" +msgstr "" + +#, python-format +msgid "%s Note: This key has expired (signed by: \"%s\")\n" +msgstr "" + +msgid "list signed changesets" +msgstr "" + +#, python-format +msgid "%s:%d node does not exist\n" +msgstr "" + +msgid "verify all the signatures there may be for a particular revision" +msgstr "" + +#, python-format +msgid "No valid signature for %s\n" +msgstr "" + +msgid "associate a string to a key (username, comment)" +msgstr "" + +msgid "" +"add a signature for the current or given revision\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "uncommitted merge - please provide a specific revision" +msgstr "" + +msgid "Error while signing" +msgstr "" + +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" + +#, python-format +msgid "Added signature for changeset %s" +msgstr "" + +msgid "map a manifest into some text" +msgstr "" + +msgid "unknown signature version" +msgstr "" + +msgid "make the signature local" +msgstr "" + +msgid "sign even if the sigfile is modified" +msgstr "" + +msgid "do not commit the sigfile after signing" +msgstr "" + +msgid "the key id to sign with" +msgstr "" + +msgid "commit message" +msgstr "" + +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "" + +msgid "hg sigcheck REVISION" +msgstr "" + +msgid "hg sigs" +msgstr "" + +msgid "" +"show revision graphs in terminal windows\n" +"\n" +"This extension adds a --graph option to the incoming, outgoing and log\n" +"commands. When this options is given, an ascii representation of the\n" +"revision graph is also shown.\n" +msgstr "" + +msgid "" +"cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history from revision\n" +" start to revision stop (which must be less than or equal to start).\n" +" " +msgstr "" + +msgid "" +"file cset DAG generator yielding (rev, node, [parents]) tuples\n" +"\n" +" This generator function walks through the revision history of a single\n" +" file from revision start to revision stop (which must be less than or\n" +" equal to start).\n" +" " +msgstr "" + +msgid "" +"grapher for asciigraph on a list of nodes and their parents\n" +"\n" +" nodes must generate tuples (node, parents, char, lines) where\n" +" - parents must generate the parents of node, in sorted order,\n" +" and max length 2,\n" +" - char is the char to print as the node symbol, and\n" +" - lines are the lines to display next to the node.\n" +" " +msgstr "" + +msgid "" +"prints an ASCII graph of the DAG returned by the grapher\n" +"\n" +" grapher is a generator that emits tuples with the following elements:\n" +"\n" +" - Character to use as node's symbol.\n" +" - List of lines to display as the node's text.\n" +" - Column of the current node in the set of ongoing edges.\n" +" - Edges; a list of (col, next_col) indicating the edges between\n" +" the current node and its parents.\n" +" - Number of columns (ongoing edges) in the current revision.\n" +" - The difference between the number of columns (ongoing edges)\n" +" in the next revision and the number of columns (ongoing edges)\n" +" in the current revision. That is: -1 means one column removed;\n" +" 0 means no columns added or removed; 1 means one column added.\n" +" " +msgstr "" + +#, python-format +msgid "--graph option is incompatible with --%s" +msgstr "" + +msgid "" +"show revision history alongside an ASCII revision graph\n" +"\n" +" Print a revision history alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "" +"show the outgoing changesets alongside an ASCII revision graph\n" +"\n" +" Print the outgoing changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +#, python-format +msgid "comparing with %s\n" +msgstr "" + +msgid "no changes found\n" +msgstr "没有发现修改\n" + +msgid "" +"show the incoming changesets alongside an ASCII revision graph\n" +"\n" +" Print the incoming changesets alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +msgid "wrap the command" +msgstr "" + +msgid "show the revision DAG" +msgstr "显示版本分支图" + +msgid "limit number of changes displayed" +msgstr "限制显示的改变集数量" + +msgid "show patch" +msgstr "显示补丁" + +msgid "show the specified revision or range" +msgstr "" + +msgid "hg glog [OPTION]... [FILE]" +msgstr "" + +msgid "" +"CIA notification\n" +"\n" +"This is meant to be run as a changegroup or incoming hook.\n" +"To configure it, set the following options in your hgrc:\n" +"\n" +"[cia]\n" +"# your registered CIA user name\n" +"user = foo\n" +"# the name of the project in CIA\n" +"project = foo\n" +"# the module (subproject) (optional)\n" +"#module = foo\n" +"# Append a diffstat to the log message (optional)\n" +"#diffstat = False\n" +"# Template to use for log messages (optional)\n" +"#template = {desc}\n" +"{baseurl}/rev/{node}-- {diffstat}\n" +"# Style to use (optional)\n" +"#style = foo\n" +"# The URL of the CIA notification service (optional)\n" +"# You can use mailto: URLs to send by email, eg\n" +"# mailto:cia@cia.vc\n" +"# Make sure to set email.from if you do this.\n" +"#url = http://cia.vc/\n" +"# print message instead of sending it (optional)\n" +"#test = False\n" +"\n" +"[hooks]\n" +"# one of these:\n" +"changegroup.cia = python:hgcia.hook\n" +"#incoming.cia = python:hgcia.hook\n" +"\n" +"[web]\n" +"# If you want hyperlinks (optional)\n" +"baseurl = http://server/path/to/repo\n" +msgstr "" + +msgid " A CIA message " +msgstr "" + +msgid " CIA notification class " +msgstr "" + +#, python-format +msgid "hgcia: sending update to %s\n" +msgstr "" + +msgid " send CIA notification " +msgstr "" + +msgid "email.from must be defined when sending by email" +msgstr "" + +msgid "cia: no user specified" +msgstr "" + +msgid "cia: no project specified" +msgstr "" + +msgid "" +"browsing the repository in a graphical way\n" +"\n" +"The hgk extension allows browsing the history of a repository in a\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" +"not distributed with Mercurial.)\n" +"\n" +"hgk consists of two parts: a Tcl script that does the displaying and\n" +"querying of information, and an extension to mercurial named hgk.py,\n" +"which provides hooks for hgk to get information. hgk can be found in\n" +"the contrib directory, and hgk.py can be found in the hgext directory.\n" +"\n" +"To load the hgext.py extension, add it to your .hgrc file (you have\n" +"to use your global $HOME/.hgrc file, not one in a repository). You\n" +"can specify an absolute path:\n" +"\n" +" [extensions]\n" +" hgk=/usr/local/lib/hgk.py\n" +"\n" +"Mercurial can also scan the default python library path for a file\n" +"named 'hgk.py' if you set hgk empty:\n" +"\n" +" [extensions]\n" +" hgk=\n" +"\n" +"The hg view command will launch the hgk Tcl script. For this command\n" +"to work, hgk must be in your search path. Alternately, you can\n" +"specify the path to hgk in your .hgrc file:\n" +"\n" +" [hgk]\n" +" path=/location/of/hgk\n" +"\n" +"hgk can make use of the extdiff extension to visualize revisions.\n" +"Assuming you had already configured extdiff vdiff command, just add:\n" +"\n" +" [hgk]\n" +" vdiff=vdiff\n" +"\n" +"Revisions context menu will now display additional entries to fire\n" +"vdiff on hovered and selected revisions." +msgstr "" + +msgid "diff trees from two commits" +msgstr "" + +msgid "output common ancestor information" +msgstr "" + +msgid "cat a specific revision" +msgstr "" + +msgid "cat-file: type or revision not supplied\n" +msgstr "" + +msgid "aborting hg cat-file only understands commits\n" +msgstr "" + +msgid "parse given revisions" +msgstr "" + +msgid "print revisions" +msgstr "" + +msgid "print extension options" +msgstr "" + +msgid "start interactive history viewer" +msgstr "" + +msgid "hg view [-l LIMIT] [REVRANGE]" +msgstr "" + +msgid "generate patch" +msgstr "" + +msgid "recursive" +msgstr "" + +msgid "pretty" +msgstr "" + +msgid "stdin" +msgstr "" + +msgid "detect copies" +msgstr "" + +msgid "search" +msgstr "" + +msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." +msgstr "" + +msgid "hg debug-cat-file [OPTION]... TYPE FILE" +msgstr "" + +msgid "hg debug-config" +msgstr "" + +msgid "hg debug-merge-base node node" +msgstr "" + +msgid "ignored" +msgstr "" + +msgid "hg debug-rev-parse REV" +msgstr "" + +msgid "header" +msgstr "" + +msgid "topo-order" +msgstr "" + +msgid "parents" +msgstr "" + +msgid "max-count" +msgstr "" + +msgid "hg debug-rev-list [options] revs" +msgstr "" + +msgid "" +"syntax highlighting in hgweb, based on Pygments\n" +"\n" +"It depends on the pygments syntax highlighting library:\n" +"http://pygments.org/\n" +"\n" +"To enable the extension add this to hgrc:\n" +"\n" +"[extensions]\n" +"hgext.highlight =\n" +"\n" +"There is a single configuration option:\n" +"\n" +"[web]\n" +"pygments_style = <style>\n" +"\n" +"The default is 'colorful'.\n" +"\n" +"-- Adam Hupp <adam@hupp.org>\n" +msgstr "" + +msgid "inotify-based status acceleration for Linux systems\n" +msgstr "" + +msgid "start an inotify server for this repository" +msgstr "为此版本库启动服务 'inotify'" + +msgid "(found dead inotify server socket; removing it)\n" +msgstr "" + +msgid "(starting inotify server)\n" +msgstr "" + +#, python-format +msgid "could not start inotify server: %s\n" +msgstr "" + +#, python-format +msgid "could not talk to new inotify server: %s\n" +msgstr "" + +msgid "(inotify server not running)\n" +msgstr "" + +#, python-format +msgid "failed to contact inotify server: %s\n" +msgstr "" + +msgid "run server in background" +msgstr "在后台运行服务" + +msgid "used internally by daemon mode" +msgstr "在后台服务模式内部使用" + +msgid "minutes to sit idle before exiting" +msgstr "空闲几分钟后退出" + +msgid "name of file to write process ID to" +msgstr "写入进程标识符的文件名称" + +msgid "hg inserve [OPT]..." +msgstr "" + +#, python-format +msgid "(inotify: received response from incompatible server version %d)\n" +msgstr "" + +msgid "this system does not seem to support inotify" +msgstr "" + +#, python-format +msgid "*** the current per-user limit on the number of inotify watches is %s\n" +msgstr "" + +msgid "*** this limit is too low to watch every directory in this repository\n" +msgstr "" + +msgid "*** counting directories: " +msgstr "" + +#, python-format +msgid "found %d\n" +msgstr "" + +#, python-format +msgid "*** to raise the limit from %d to %d (run as root):\n" +msgstr "" + +#, python-format +msgid "*** echo %d > %s\n" +msgstr "" + +#, python-format +msgid "cannot watch %s until inotify watch limit is raised" +msgstr "" + +#, python-format +msgid "inotify service not available: %s" +msgstr "" + +#, python-format +msgid "watching %r\n" +msgstr "" + +#, python-format +msgid "watching directories under %r\n" +msgstr "" + +#, python-format +msgid "status: %r dir(%d) -> %s\n" +msgstr "" + +#, python-format +msgid "status: %r %s -> %s\n" +msgstr "" + +#, python-format +msgid "%s dirstate reload\n" +msgstr "" + +#, python-format +msgid "%s end dirstate reload\n" +msgstr "" + +msgid "rescanning due to .hgignore change\n" +msgstr "" + +#, python-format +msgid "%s event: created %s\n" +msgstr "" + +#, python-format +msgid "%s event: deleted %s\n" +msgstr "" + +#, python-format +msgid "%s event: modified %s\n" +msgstr "" + +#, python-format +msgid "filesystem containing %s was unmounted\n" +msgstr "" + +#, python-format +msgid "%s readable: %d bytes\n" +msgstr "" + +#, python-format +msgid "%s below threshold - unhooking\n" +msgstr "" + +#, python-format +msgid "%s reading %d events\n" +msgstr "" + +#, python-format +msgid "%s hooking back up with %d bytes readable\n" +msgstr "" + +#, python-format +msgid "%s processing %d deferred events as %d\n" +msgstr "" + +#, python-format +msgid "could not start server: %s" +msgstr "" + +#, python-format +msgid "received query from incompatible client version %d\n" +msgstr "" + +#, python-format +msgid "answering query for %r\n" +msgstr "" + +msgid "finished setup\n" +msgstr "" + +msgid "polling: no timeout\n" +msgstr "" + +#, python-format +msgid "polling: %sms timeout\n" +msgstr "" + +#, python-format +msgid "interhg: invalid pattern for %s: %s\n" +msgstr "" + +#, python-format +msgid "interhg: invalid regexp for %s: %s\n" +msgstr "" + +msgid "" +"keyword expansion in local repositories\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$\n" +"in tracked text files selected by your configuration.\n" +"\n" +"Keywords are only expanded in local repositories and not stored in\n" +"the change history. The mechanism can be regarded as a convenience\n" +"for the current user or for archive distribution.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections\n" +"of hgrc files.\n" +"\n" +"Example:\n" +"\n" +" [keyword]\n" +" # expand keywords in every python file except those matching \"x*\"\n" +" **.py =\n" +" x* = ignore\n" +"\n" +"Note: the more specific you are in your filename patterns\n" +" the less you lose speed in huge repos.\n" +"\n" +"For [keywordmaps] template mapping and expansion demonstration and\n" +"control run \"hg kwdemo\".\n" +"\n" +"An additional date template filter {date|utcdate} is provided.\n" +"\n" +"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" +"with customized keywords and templates.\n" +"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"\n" +"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +"the risk of inadvertedly storing expanded keywords in the change history.\n" +"\n" +"To force expansion after enabling it, or a configuration change, run\n" +"\"hg kwexpand\".\n" +"\n" +"Also, when committing with the record extension or using mq's qrecord, be " +"aware\n" +"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" +"question to update keyword expansions after all changes have been checked " +"in.\n" +"\n" +"Expansions spanning more than one line and incremental expansions,\n" +"like CVS' $Log$, are not supported. A keyword template map\n" +"\"Log = {desc}\" expands to the first line of the changeset description.\n" +msgstr "" + +msgid "Returns hgdate in cvs-like UTC format." +msgstr "" + +msgid "" +"\n" +" Sets up keyword templates, corresponding keyword regex, and\n" +" provides keyword substitution functions.\n" +" " +msgstr "" + +msgid "Replaces keywords in data with expanded template." +msgstr "" + +msgid "Returns data with keywords expanded." +msgstr "" + +msgid "" +"Returns true if path matches [keyword] pattern\n" +" and is not a symbolic link.\n" +" Caveat: localrepository._link fails on Windows." +msgstr "" + +msgid "Overwrites selected files expanding/shrinking keywords." +msgstr "" + +#, python-format +msgid "overwriting %s %s keywords\n" +msgstr "" + +msgid "Unconditionally removes all keyword substitutions from text." +msgstr "" + +msgid "Returns text with all keyword substitutions removed." +msgstr "" + +msgid "Returns lines with keyword substitutions removed." +msgstr "" + +msgid "" +"If in restricted mode returns data read from wdir with\n" +" keyword substitutions removed." +msgstr "" + +msgid "" +"\n" +" Subclass of filelog to hook into its read, add, cmp methods.\n" +" Keywords are \"stored\" unexpanded, and processed on reading.\n" +" " +msgstr "" + +msgid "Expands keywords when reading filelog." +msgstr "" + +msgid "Removes keyword substitutions when adding to filelog." +msgstr "" + +msgid "Removes keyword substitutions for comparison." +msgstr "" + +msgid "" +"Bails out if [keyword] configuration is not active.\n" +" Returns status of working directory." +msgstr "" + +msgid "[keyword] patterns cannot match" +msgstr "" + +msgid "no [keyword] patterns configured" +msgstr "" + +msgid "Selects files and passes them to kwtemplater.overwrite." +msgstr "" + +msgid "" +"print [keywordmaps] configuration and an expansion example\n" +"\n" +" Show current, custom, or default keyword template maps\n" +" and their expansion.\n" +"\n" +" Extend current configuration by specifying maps as arguments\n" +" and optionally by reading from an additional hgrc file.\n" +"\n" +" Override current keyword template maps with \"default\" option.\n" +" " +msgstr "" + +#, python-format +msgid "" +"\n" +"\t%s\n" +msgstr "" + +#, python-format +msgid "creating temporary repo at %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"%s keywords written to %s:\n" +msgstr "" + +msgid "unhooked all commit hooks\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"removing temporary repo %s\n" +msgstr "" +"\n" +"正在删除临时版本库 %s\n" + +msgid "" +"expand keywords in working directory\n" +"\n" +" Run after (re)enabling keyword expansion.\n" +"\n" +" kwexpand refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"print files currently configured for keyword expansion\n" +"\n" +" Crosscheck which files in working directory are potential targets for\n" +" keyword expansion.\n" +" That is, files matched by [keyword] config patterns but not symlinks.\n" +" " +msgstr "" + +msgid "" +"revert expanded keywords in working directory\n" +"\n" +" Run before changing/disabling active keywords\n" +" or if you experience problems with \"hg import\" or \"hg merge\".\n" +"\n" +" kwshrink refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"Collects [keyword] config in kwtools.\n" +" Monkeypatches dispatch._parse if needed." +msgstr "" + +msgid "Monkeypatch dispatch._parse to obtain running hg command." +msgstr "" + +msgid "" +"Sets up repo as kwrepo for keyword substitution.\n" +" Overrides file method to return kwfilelog instead of filelog\n" +" if file matches user configuration.\n" +" Wraps commit to overwrite configured files with updated\n" +" keyword substitutions.\n" +" Monkeypatches patch and webcommands." +msgstr "" + +msgid "" +"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" +" rejects or conflicts due to expanded keywords in working dir." +msgstr "" + +msgid "" +"Monkeypatch patch.diff to avoid expansion except when\n" +" comparing against working dir." +msgstr "" + +msgid "Wraps webcommands.x turning off keyword expansion." +msgstr "" + +msgid "show default keyword template maps" +msgstr "" + +msgid "read maps from rcfile" +msgstr "" + +msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." +msgstr "" + +msgid "hg kwexpand [OPTION]... [FILE]..." +msgstr "" + +msgid "show keyword status flags of all files" +msgstr "" + +msgid "show files excluded from expansion" +msgstr "" + +msgid "additionally show untracked files" +msgstr "" + +msgid "hg kwfiles [OPTION]... [FILE]..." +msgstr "" + +msgid "hg kwshrink [OPTION]... [FILE]..." +msgstr "" + +msgid "" +"patch management and development\n" +"\n" +"This extension lets you work with a stack of patches in a Mercurial\n" +"repository. It manages two stacks of patches - all known patches, and\n" +"applied patches (subset of known patches).\n" +"\n" +"Known patches are represented as patch files in the .hg/patches\n" +"directory. Applied patches are both patch files and changesets.\n" +"\n" +"Common tasks (use \"hg help command\" for more details):\n" +"\n" +"prepare repository to work with patches qinit\n" +"create new patch qnew\n" +"import existing patch qimport\n" +"\n" +"print patch series qseries\n" +"print applied patches qapplied\n" +"print name of top applied patch qtop\n" +"\n" +"add known patch to applied stack qpush\n" +"remove patch from applied stack qpop\n" +"refresh contents of top applied patch qrefresh\n" +msgstr "" + +msgid "" +"Update all references to a field in the patch header.\n" +" If none found, add it email style." +msgstr "" + +msgid "" +"Remove existing message, keeping the rest of the comments fields.\n" +" If comments contains 'subject: ', message will prepend\n" +" the field and a blank line." +msgstr "" + +#, python-format +msgid "%s appears more than once in %s" +msgstr "" + +msgid "guard cannot be an empty string" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid character: %r" +msgstr "" + +#, python-format +msgid "invalid character in guard %r: %r" +msgstr "" + +#, python-format +msgid "active guards: %s\n" +msgstr "" + +#, python-format +msgid "guard %r too short" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid char" +msgstr "" + +#, python-format +msgid "allowing %s - no guards in effect\n" +msgstr "" + +#, python-format +msgid "allowing %s - no matching negative guards\n" +msgstr "" + +#, python-format +msgid "allowing %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - no matching guards\n" +msgstr "" + +#, python-format +msgid "error removing undo: %s\n" +msgstr "" + +#, python-format +msgid "apply failed for patch %s" +msgstr "" + +#, python-format +msgid "patch didn't work out, merging %s\n" +msgstr "" + +#, python-format +msgid "update returned %d" +msgstr "" + +msgid "repo commit failed" +msgstr "" + +#, python-format +msgid "unable to read %s" +msgstr "" + +#, python-format +msgid "patch %s does not exist\n" +msgstr "" + +#, python-format +msgid "patch %s is not applied\n" +msgstr "" + +msgid "" +"Apply patchfile to the working directory.\n" +" patchfile: file name of patch" +msgstr "" + +msgid "patch failed, unable to continue (try -v)\n" +msgstr "" + +#, python-format +msgid "applying %s\n" +msgstr "" + +#, python-format +msgid "Unable to read %s\n" +msgstr "" + +#, python-format +msgid "imported patch %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"imported patch %s" +msgstr "" + +#, python-format +msgid "patch %s is empty\n" +msgstr "" + +msgid "patch failed, rejects left in working dir\n" +msgstr "" + +msgid "fuzz found when applying patch, stopping\n" +msgstr "" + +#, python-format +msgid "revision %d is not managed" +msgstr "" + +#, python-format +msgid "cannot delete revision %d above applied patches" +msgstr "" + +msgid "qdelete requires at least one revision or patch name" +msgstr "" + +#, python-format +msgid "cannot delete applied patch %s" +msgstr "" + +#, python-format +msgid "patch %s not in series file" +msgstr "" + +msgid "no patches applied" +msgstr "" + +msgid "working directory revision is not qtip" +msgstr "" + +msgid "local changes found, refresh first" +msgstr "" + +msgid "local changes found" +msgstr "" + +#, python-format +msgid "\"%s\" cannot be used as the name of a patch" +msgstr "" + +msgid "" +"options:\n" +" msg: a string or a no-argument function returning a string\n" +" " +msgstr "" + +#, python-format +msgid "patch \"%s\" already exists" +msgstr "" + +#, python-format +msgid "error unlinking %s\n" +msgstr "" + +msgid "returns (index, rev, patch)" +msgstr "" + +#, python-format +msgid "patch name \"%s\" is ambiguous:\n" +msgstr "" + +#, python-format +msgid "patch %s not in series" +msgstr "" + +msgid "(working directory not at tip)\n" +msgstr "" + +msgid "no patches in series\n" +msgstr "" + +#, python-format +msgid "cannot push to a previous patch: %s" +msgstr "" + +#, python-format +msgid "qpush: %s is already at the top\n" +msgstr "" + +#, python-format +msgid "guarded by %r" +msgstr "" + +msgid "no matching guards" +msgstr "" + +#, python-format +msgid "cannot push '%s' - %s\n" +msgstr "" + +msgid "all patches are currently applied\n" +msgstr "" + +msgid "patch series already fully applied\n" +msgstr "" + +msgid "cleaning up working directory..." +msgstr "" + +#, python-format +msgid "errors during apply, please fix and refresh %s\n" +msgstr "" + +#, python-format +msgid "now at: %s\n" +msgstr "" + +#, python-format +msgid "patch %s is not applied" +msgstr "" + +msgid "no patches applied\n" +msgstr "" + +#, python-format +msgid "qpop: %s is already at the top\n" +msgstr "" + +msgid "qpop: forcing dirstate update\n" +msgstr "" + +#, python-format +msgid "trying to pop unknown node %s" +msgstr "" + +msgid "popping would remove a revision not managed by this patch queue" +msgstr "" + +msgid "deletions found between repo revs" +msgstr "" + +msgid "patch queue now empty\n" +msgstr "" + +msgid "cannot refresh a revision with children" +msgstr "" + +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +msgstr "" + +msgid "patch queue directory already exists" +msgstr "" + +#, python-format +msgid "patch %s is not in series file" +msgstr "" + +msgid "No saved patch data found\n" +msgstr "" + +#, python-format +msgid "restoring status: %s\n" +msgstr "" + +msgid "save entry has children, leaving it alone\n" +msgstr "" + +#, python-format +msgid "removing save entry %s\n" +msgstr "" + +#, python-format +msgid "saved queue repository parents: %s %s\n" +msgstr "" + +msgid "queue directory updating\n" +msgstr "" + +msgid "Unable to load queue repository\n" +msgstr "" + +msgid "save: no patches applied, exiting\n" +msgstr "" + +msgid "status is already saved\n" +msgstr "" + +msgid "hg patches saved state" +msgstr "" + +msgid "repo commit failed\n" +msgstr "" + +msgid "" +"If all_patches is False, return the index of the next pushable patch\n" +" in the series, or the series length. If all_patches is True, return " +"the\n" +" index of the first patch past the last applied one.\n" +" " +msgstr "" + +#, python-format +msgid "patch %s is already in the series file" +msgstr "" + +msgid "option \"-r\" not valid when importing files" +msgstr "" + +msgid "option \"-n\" not valid when importing multiple patches" +msgstr "" + +#, python-format +msgid "revision %d is the root of more than one branch" +msgstr "" + +#, python-format +msgid "revision %d is already managed" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of the queue" +msgstr "" + +#, python-format +msgid "revision %d has unmanaged children" +msgstr "" + +#, python-format +msgid "cannot import merge revision %d" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of %d" +msgstr "" + +msgid "-e is incompatible with import from -" +msgstr "" + +#, python-format +msgid "patch %s does not exist" +msgstr "" + +msgid "need --name to import a patch from -" +msgstr "" + +#, python-format +msgid "adding %s to series file\n" +msgstr "" + +msgid "" +"remove patches from queue\n" +"\n" +" The patches must not be applied, unless they are arguments to\n" +" the --rev parameter. At least one patch or revision is required.\n" +"\n" +" With --rev, mq will stop managing the named revisions (converting\n" +" them to regular mercurial changesets). The qfinish command should be\n" +" used as an alternative for qdel -r, as the latter option is deprecated.\n" +"\n" +" With --keep, the patch files are preserved in the patch directory." +msgstr "" + +msgid "print the patches already applied" +msgstr "" + +msgid "print the patches not yet applied" +msgstr "" + +msgid "" +"import a patch\n" +"\n" +" The patch is inserted into the series after the last applied patch.\n" +" If no patches have been applied, qimport prepends the patch\n" +" to the series.\n" +"\n" +" The patch will have the same name as its source file unless you\n" +" give it a new one with --name.\n" +"\n" +" You can register an existing patch inside the patch directory\n" +" with the --existing flag.\n" +"\n" +" With --force, an existing patch of the same name will be overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with --rev\n" +" (e.g. qimport --rev tip -n patch will place tip under mq control).\n" +" With --git, patches imported with --rev will use the git diff\n" +" format. See the diffs help topic for information on why this is\n" +" important for preserving rename/copy information and permission changes.\n" +" " +msgstr "" +"导入补丁\n" +"\n" +" 此补丁插入到最近一次应用的补丁序列中。\n" +" 如果尚无应用补丁，qimport 会插入补丁到序列开始。\n" +"\n" +" 除非你使用 '--name' 给出补丁名称，否则就与源文件同名。\n" +"\n" +" 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n" +"\n" +" 使用 '--force' 会覆盖已有的补丁。\n" +"\n" +" 可以使用 '--rev' 将已有的改变集置于 mq 控制下(例如 \n" +" 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n" +" 时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n" +" 为什么这对于保留改名/复制信息和权限修改很重要。\n" +" " + +msgid "" +"init a new queue repository\n" +"\n" +" The queue repository is unversioned by default. If -c is\n" +" specified, qinit will create a separate nested repository\n" +" for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one).\n" +" You can use qcommit to commit changes to this queue repository." +msgstr "" +"初始化队列仓库\n" +"\n" +" 默认队列仓库不受版本控制。如果指定了 '-c'，那么 qinit 会为补丁创建一个\n" +" 单独的嵌套版本库(也可以稍后运行 'qinit -c' 来将不受版本控制的补丁仓库\n" +" 转换成受版本控制)。你可以使用 'qcommit' 提交改变到此队列版本库。" + +msgid "" +"clone main and patch repository at same time\n" +"\n" +" If source is local, destination will have no patches applied. If\n" +" source is remote, this command can not check if patches are\n" +" applied in source, so cannot guarantee that patches are not\n" +" applied in destination. If you clone remote repository, be sure\n" +" before that it has no patches applied.\n" +"\n" +" Source patch repository is looked for in <src>/.hg/patches by\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested mercurial repository, as\n" +" would be created by qinit -c.\n" +" " +msgstr "" + +msgid "versioned patch repository not found (see qinit -c)" +msgstr "" + +msgid "cloning main repo\n" +msgstr "" + +msgid "cloning patch repo\n" +msgstr "" + +msgid "stripping applied patches from destination repo\n" +msgstr "" + +msgid "updating destination repo\n" +msgstr "" + +msgid "commit changes in the queue repository" +msgstr "" + +msgid "print the entire series file" +msgstr "" + +msgid "print the name of the current patch" +msgstr "" + +msgid "print the name of the next patch" +msgstr "" + +msgid "all patches applied\n" +msgstr "" + +msgid "print the name of the previous patch" +msgstr "" + +msgid "only one patch applied\n" +msgstr "" + +msgid "" +"create a new patch\n" +"\n" +" qnew creates a new patch on top of the currently-applied patch (if any).\n" +" It will refuse to run if there are any outstanding changes unless -f is\n" +" specified, in which case the patch will be initialized with them. You\n" +" may also use -I, -X, and/or a list of files after the patch name to add\n" +" only changes to matching files to the new patch, leaving the rest as\n" +" uncommitted modifications.\n" +"\n" +" -u and -d can be used to set the (given) user and date, respectively.\n" +" -U and -D set user to current user and date to current date.\n" +"\n" +" -e, -m or -l set the patch header as well as the commit message. If none\n" +" is specified, the header is empty and the commit message is '[mq]: " +"PATCH'.\n" +"\n" +" Use the --git option to keep the patch in the git extended diff\n" +" format. Read the diffs help topic for more information on why this\n" +" is important for preserving permission changes and copy/rename\n" +" information.\n" +" " +msgstr "" + +msgid "" +"update the current patch\n" +"\n" +" If any file patterns are provided, the refreshed patch will contain only\n" +" the modifications that match those patterns; the remaining modifications\n" +" will remain in the working directory.\n" +"\n" +" If --short is specified, files currently included in the patch will\n" +" be refreshed just like matched files and remain in the patch.\n" +"\n" +" hg add/remove/copy/rename work as usual, though you might want to use\n" +" git-style patches (--git or [diff] git=1) to track copies and renames.\n" +" See the diffs help topic for more information on the git diff format.\n" +" " +msgstr "" +"更新当前补丁\n" +"\n" +" 如果提供了文件匹配模式，更新后的补丁只包含匹配这些模式的修改，其它\n" +" 的修改仍旧在工作目录中。\n" +"\n" +" 如果指定了 '--short'，只更新已经在补丁中的文件，与文件匹配模式类似。\n" +"\n" +" 'hg add/remove/copy/rename' 如常工作，你可能想使用 git 格式补丁(使\n" +" 用选项 '--git' 或在配置文件的 [diff] 区中设置 git=1)以跟踪复制和改\n" +" 名。请参见差异帮助主题，以了解关于 git 差异格式的更多信息。\n" +" " + +msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" +msgstr "" + +msgid "" +"diff of the current patch and subsequent modifications\n" +"\n" +" Shows a diff which includes the current patch as well as any changes " +"which\n" +" have been made in the working directory since the last refresh (thus\n" +" showing what the current patch would become after a qrefresh).\n" +"\n" +" Use 'hg diff' if you only want to see the changes made since the last\n" +" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" +" current patch without including changes made since the qrefresh.\n" +" " +msgstr "" +"显式当前的补丁和后续的修改\n" +"\n" +" 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n" +" 显示当前的补丁)。\n" +"\n" +" 如果你只想看到最近一次刷新之后的修改请使用 'hg diff'，如果你只想看到当\n" +" 前的补丁请使用 'hg export qtip'。\n" +" " + +msgid "" +"fold the named patches into the current patch\n" +"\n" +" Patches must not yet be applied. Each patch will be successively\n" +" applied to the current patch in the order given. If all the\n" +" patches apply successfully, the current patch will be refreshed\n" +" with the new cumulative patch, and the folded patches will\n" +" be deleted. With -k/--keep, the folded patch files will not\n" +" be removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with\n" +" the current patch header, separated by a line of '* * *'." +msgstr "" + +msgid "qfold requires at least one patch name" +msgstr "" + +msgid "No patches applied" +msgstr "" + +#, python-format +msgid "Skipping already folded patch %s" +msgstr "" + +#, python-format +msgid "qfold cannot fold already applied patch %s" +msgstr "" + +#, python-format +msgid "Error folding patch %s" +msgstr "" + +msgid "push or pop patches until named patch is at top of stack" +msgstr "" + +msgid "" +"set or print guards for a patch\n" +"\n" +" Guards control whether a patch can be pushed. A patch with no\n" +" guards is always pushed. A patch with a positive guard (\"+foo\") is\n" +" pushed only if the qselect command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" has activated it.\n" +"\n" +" With no arguments, print the currently active guards.\n" +" With arguments, set guards for the named patch.\n" +" NOTE: Specifying negative guards now requires '--'.\n" +"\n" +" To set guards on another patch:\n" +" hg qguard -- other.patch +2.6.17 -stable\n" +" " +msgstr "" + +msgid "cannot mix -l/--list with options or arguments" +msgstr "" + +msgid "no patch to work with" +msgstr "" + +#, python-format +msgid "no patch named %s" +msgstr "" + +msgid "print the header of the topmost or specified patch" +msgstr "" + +msgid "" +"push the next patch onto the stack\n" +"\n" +" When --force is applied, all local changes in patched files will be " +"lost.\n" +" " +msgstr "" +"将下个补丁压入堆栈\n" +"\n" +" 当指定 '--force' 时，所有在补丁文件中的本地修改都会丢失。\n" +" " + +msgid "no saved queues found, please use -n\n" +msgstr "" + +#, python-format +msgid "merging with queue at: %s\n" +msgstr "" + +msgid "" +"pop the current patch off the stack\n" +"\n" +" By default, pops off the top of the patch stack. If given a patch name,\n" +" keeps popping off patches until the named patch is at the top of the " +"stack.\n" +" " +msgstr "" +"将当前补丁弹出堆栈\n" +"\n" +" 默认将补丁堆栈的顶部弹出。如果指定了补丁名称，那么就会一直弹出，直到此\n" +" 补丁位于堆栈顶部。\n" +" " + +#, python-format +msgid "using patch queue: %s\n" +msgstr "" + +msgid "" +"rename a patch\n" +"\n" +" With one argument, renames the current patch to PATCH1.\n" +" With two arguments, renames PATCH1 to PATCH2." +msgstr "" + +#, python-format +msgid "%s already exists" +msgstr "" + +#, python-format +msgid "A patch named %s already exists in the series file" +msgstr "" + +msgid "restore the queue state saved by a rev" +msgstr "" + +msgid "save current queue state" +msgstr "" + +#, python-format +msgid "destination %s exists and is not a directory" +msgstr "" + +#, python-format +msgid "destination %s exists, use -f to force" +msgstr "" + +#, python-format +msgid "copy %s to %s\n" +msgstr "" + +msgid "" +"strip a revision and all its descendants from the repository\n" +"\n" +" If one of the working dir's parent revisions is stripped, the working\n" +" directory will be updated to the parent of the stripped revision.\n" +" " +msgstr "" +"从版本库删除一个版本以及它的子孙\n" +"\n" +" 如果有工作目录的父版本被删除，那么此目录会被更新到已删除版本的父版本。\n" +" " + +msgid "" +"set or print guarded patches to push\n" +"\n" +" Use the qguard command to set or print guards on patch, then use\n" +" qselect to tell mq which guards to use. A patch will be pushed if it\n" +" has no guards or any positive guards match the currently selected guard,\n" +" but will not be pushed if any negative guards match the current guard.\n" +" For example:\n" +"\n" +" qguard foo.patch -stable (negative guard)\n" +" qguard bar.patch +stable (positive guard)\n" +" qselect stable\n" +"\n" +" This activates the \"stable\" guard. mq will skip foo.patch (because\n" +" it has a negative match) but push bar.patch (because it\n" +" has a positive match).\n" +"\n" +" With no arguments, prints the currently active guards.\n" +" With one argument, sets the active guard.\n" +"\n" +" Use -n/--none to deactivate guards (no other arguments needed).\n" +" When no guards are active, patches with positive guards are skipped\n" +" and patches with negative guards are pushed.\n" +"\n" +" qselect can change the guards on applied patches. It does not pop\n" +" guarded patches by default. Use --pop to pop back to the last applied\n" +" patch that is not guarded. Use --reapply (which implies --pop) to push\n" +" back to the current patch afterwards, but skip guarded patches.\n" +"\n" +" Use -s/--series to print a list of all guards in the series file (no\n" +" other arguments needed). Use -v for more information." +msgstr "" + +msgid "guards deactivated\n" +msgstr "" + +#, python-format +msgid "number of unguarded, unapplied patches has changed from %d to %d\n" +msgstr "" + +#, python-format +msgid "number of guarded, applied patches has changed from %d to %d\n" +msgstr "" + +msgid "guards in series file:\n" +msgstr "" + +msgid "no guards in series file\n" +msgstr "" + +msgid "active guards:\n" +msgstr "" + +msgid "no active guards\n" +msgstr "" + +msgid "popping guarded patches\n" +msgstr "" + +msgid "reapplying unguarded patches\n" +msgstr "" + +msgid "" +"move applied patches into repository history\n" +"\n" +" Finishes the specified revisions (corresponding to applied patches) by\n" +" moving them out of mq control into regular repository history.\n" +"\n" +" Accepts a revision range or the --applied option. If --applied is\n" +" specified, all applied mq revisions are removed from mq control.\n" +" Otherwise, the given revisions must be at the base of the stack of\n" +" applied patches.\n" +"\n" +" This can be especially useful if your changes have been applied to an\n" +" upstream repository, or if you are about to push your changes to " +"upstream.\n" +" " +msgstr "" + +msgid "no revisions specified" +msgstr "" + +msgid "cannot commit over an applied mq patch" +msgstr "" + +msgid "source has mq patches applied" +msgstr "" + +#, python-format +msgid "mq status file refers to unknown node %s\n" +msgstr "" + +#, python-format +msgid "Tag %s overrides mq patch of the same name\n" +msgstr "" + +msgid "cannot import over an applied patch" +msgstr "" + +msgid "print first line of patch header" +msgstr "" + +msgid "hg qapplied [-s] [PATCH]" +msgstr "" + +msgid "use pull protocol to copy metadata" +msgstr "数用协议 'pull' 来复制元数据" + +msgid "do not update the new working directories" +msgstr "" + +msgid "use uncompressed transfer (fast over LAN)" +msgstr "使用不压缩的传输(在局域网更快)" + +msgid "location of source patch repo" +msgstr "" + +msgid "hg qclone [OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "hg qcommit [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qdiff [OPTION]... [FILE]..." +msgstr "" + +msgid "keep patch file" +msgstr "" + +msgid "stop managing a revision" +msgstr "" + +msgid "hg qdelete [-k] [-r REV]... [PATCH]..." +msgstr "" + +msgid "edit patch header" +msgstr "" + +msgid "keep folded patch files" +msgstr "" + +msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." +msgstr "" + +msgid "overwrite any local changes" +msgstr "" + +msgid "hg qgoto [OPTION]... PATCH" +msgstr "" + +msgid "list all patches and guards" +msgstr "" + +msgid "drop all guards" +msgstr "" + +msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." +msgstr "" + +msgid "hg qheader [PATCH]" +msgstr "" + +msgid "import file in patch dir" +msgstr "从补丁目录导入文件" + +msgid "patch file name" +msgstr "补丁文件名称" + +msgid "overwrite existing files" +msgstr "覆盖已有文件" + +msgid "place existing revisions under mq control" +msgstr "将现有的版本置于 mq 控制下" + +msgid "use git extended diff format" +msgstr "使用 git 扩展差异格式" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." +msgstr "" + +msgid "create queue repository" +msgstr "创建队列版本库" + +msgid "hg qinit [-c]" +msgstr "" + +msgid "import uncommitted changes into patch" +msgstr "" + +msgid "add \"From: <current user>\" to patch" +msgstr "" + +msgid "add \"From: <given user>\" to patch" +msgstr "" + +msgid "add \"Date: <current date>\" to patch" +msgstr "" + +msgid "add \"Date: <given date>\" to patch" +msgstr "" + +msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." +msgstr "" + +msgid "hg qnext [-s]" +msgstr "" + +msgid "hg qprev [-s]" +msgstr "" + +msgid "pop all patches" +msgstr "弹出全部补丁" + +msgid "queue name to pop" +msgstr "操作的队列名称" + +msgid "forget any local changes" +msgstr "丢弃本地修改" + +msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" +msgstr "" + +msgid "apply if the patch has rejects" +msgstr "强制应用补丁" + +msgid "list patch name in commit text" +msgstr "在提交日志中列出补丁名称" + +msgid "apply all patches" +msgstr "应用所有补丁" + +msgid "merge from another queue" +msgstr "从其它队列合并" + +msgid "merge queue name" +msgstr "合并队列的名称" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" +msgstr "" + +msgid "refresh only files already in the patch and specified files" +msgstr "仅当文件已经在补丁或指定文件中时才更新" + +msgid "add/update \"From: <current user>\" in patch" +msgstr "在补丁中增加/更新 \"From: <current user>\"" + +msgid "add/update \"From: <given user>\" in patch" +msgstr "在补丁中增加/更新 \"From: <given user>\"" + +msgid "update \"Date: <current date>\" in patch (if present)" +msgstr "在补丁中更新 \"Date: <current date>\" (如果存在)" + +msgid "update \"Date: <given date>\" in patch (if present)" +msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)" + +msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." +msgstr "" + +msgid "hg qrename PATCH1 [PATCH2]" +msgstr "" + +msgid "delete save entry" +msgstr "" + +msgid "update queue working dir" +msgstr "" + +msgid "hg qrestore [-d] [-u] REV" +msgstr "" + +msgid "copy patch directory" +msgstr "" + +msgid "copy directory name" +msgstr "" + +msgid "clear queue status file" +msgstr "" + +msgid "force copy" +msgstr "" + +msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" +msgstr "" + +msgid "disable all guards" +msgstr "" + +msgid "list all guards in series file" +msgstr "" + +msgid "pop to before first guarded applied patch" +msgstr "" + +msgid "pop, then reapply patches" +msgstr "" + +msgid "hg qselect [OPTION]... [GUARD]..." +msgstr "" + +msgid "print patches not in series" +msgstr "" + +msgid "hg qseries [-ms]" +msgstr "" + +msgid "force removal with local changes" +msgstr "强制删除，纵然有本地修改" + +msgid "bundle unrelated changesets" +msgstr "打包不相关的改变集" + +msgid "no backups" +msgstr "不备份" + +msgid "hg strip [-f] [-b] [-n] REV" +msgstr "" + +msgid "hg qtop [-s]" +msgstr "" + +msgid "hg qunapplied [-s] [PATCH]" +msgstr "" + +msgid "finish all applied changesets" +msgstr "" + +msgid "hg qfinish [-a] [REV...]" +msgstr "" + +msgid "" +"hook extension to email notifications on commits/pushes\n" +"\n" +"Subscriptions can be managed through hgrc. Default mode is to print\n" +"messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure notify extension and enable in hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go in here\n" +"\n" +" config items:\n" +"\n" +" REQUIRED:\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +" OPTIONAL:\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" +" # (serve == ssh or http, push, pull, bundle)\n" +" [email]\n" +" from = user@host.com # email address to send as if none given\n" +" [web]\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +" notify config file has same format as regular hgrc. it has two\n" +" sections so you can express subscriptions in whatever way is handier\n" +" for you.\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +" glob patterns are matched against path to repo root.\n" +"\n" +" if you like, you can put notify config file in repo that users can\n" +" push changes to, they can manage their own subscriptions." +msgstr "" + +msgid "email notification class." +msgstr "" + +msgid "strip leading slashes from local path, turn into web-safe path." +msgstr "" + +msgid "try to clean up email addresses." +msgstr "" + +msgid "return list of email addresses of subscribers to this repo." +msgstr "" + +msgid "format one changeset." +msgstr "" + +msgid "true if incoming changes from this source should be skipped." +msgstr "" + +msgid "send message." +msgstr "" + +#, python-format +msgid "%s: %d new changesets" +msgstr "" + +#, python-format +msgid "notify: sending %d subscribers %d changes\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (truncated from %d to %d lines):\n" +"\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (%d lines):\n" +"\n" +msgstr "" + +msgid "" +"send email notifications to interested subscribers.\n" +"\n" +" if used as changegroup hook, send one email for all changesets in\n" +" changegroup. else send one email per changeset." +msgstr "" + +#, python-format +msgid "notify: no subscribers to repo %s\n" +msgstr "" + +#, python-format +msgid "notify: changes have source \"%s\" - skipping\n" +msgstr "" + +msgid "" +"browse command output with external pager\n" +"\n" +"To set the pager that should be used, set the application variable:\n" +"\n" +" [pager]\n" +" pager = LESS='FSRX' less\n" +"\n" +"If no pager is set, the pager extensions uses the environment\n" +"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" +"is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" +"by setting:\n" +"\n" +" [pager]\n" +" quiet = True\n" +"\n" +"You can disable the pager for certain commands by adding them to the\n" +"pager.ignore list:\n" +"\n" +" [pager]\n" +" ignore = version, help, update\n" +"\n" +"You can also enable the pager only for certain commands using pager.attend:\n" +"\n" +" [pager]\n" +" attend = log\n" +"\n" +"If pager.attend is present, pager.ignore will be ignored.\n" +"\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to " +"specify\n" +"them in the global .hgrc\n" +msgstr "" + +msgid "" +"use suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to\n" +"the ancestors of a specific revision.\n" +"\n" +"For example, if you can refer to a revision as \"foo\", then:\n" +"\n" +"- foo^N = Nth parent of foo:\n" +" foo^0 = foo\n" +" foo^1 = first parent of foo\n" +" foo^2 = second parent of foo\n" +" foo^ = foo^1\n" +"\n" +"- foo~N = Nth first grandparent of foo\n" +" foo~0 = foo\n" +" foo~1 = foo^1 = foo^ = first parent of foo\n" +" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" +msgstr "" + +msgid "" +"sending Mercurial changesets as a series of patch emails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" +"which describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +"the first line of the changeset description as the subject text.\n" +"The message contains two or three body parts:\n" +"\n" +" The remainder of the changeset description.\n" +"\n" +" [Optional] The result of running diffstat on the patch.\n" +"\n" +" The patch itself, as generated by \"hg export\".\n" +"\n" +"Each message refers to all of its predecessors using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in\n" +"threaded mail and news readers, and in mail archives.\n" +"\n" +"For each changeset, you will be prompted with a diffstat summary and\n" +"the changeset summary, so you can be sure you are sending the right changes.\n" +"\n" +"To enable this extension:\n" +"\n" +" [extensions]\n" +" hgext.patchbomb =\n" +"\n" +"To configure other defaults, add a section like this to your hgrc file:\n" +"\n" +" [email]\n" +" from = My Name <my@email>\n" +" to = recipient1, recipient2, ...\n" +" cc = cc1, cc2, ...\n" +" bcc = bcc1, bcc2, ...\n" +"\n" +"Then you can use the \"hg email\" command to mail a series of changesets\n" +"as a patchbomb.\n" +"\n" +"To avoid sending patches prematurely, it is a good idea to first run\n" +"the \"email\" command with the \"-n\" option (test only). You will be\n" +"prompted for an email recipient address, a subject an an introductory\n" +"message describing the patches of your patchbomb. Then when all is\n" +"done, patchbomb messages are displayed. If PAGER environment variable\n" +"is set, your pager will be fired up once for each patchbomb message, so\n" +"you can verify everything is alright.\n" +"\n" +"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" +"each patchbomb message in a pager or sending the messages directly,\n" +"it will create a UNIX mailbox file with the patch emails. This\n" +"mailbox file can be previewed with any mail user agent which supports\n" +"UNIX mbox files, i.e. with mutt:\n" +"\n" +" % mutt -R -f mbox\n" +"\n" +"When you are previewing the patchbomb messages, you can use `formail'\n" +"(a utility that is commonly installed as part of the procmail package),\n" +"to send each message out:\n" +"\n" +" % formail -s sendmail -bm -t < mbox\n" +"\n" +"That should be all. Now your patchbomb is on its way out.\n" +"\n" +"You can also either configure the method option in the email section\n" +"to be a sendmail compatable mailer or fill out the [smtp] section so\n" +"that the patchbomb extension can automatically send patchbombs directly\n" +"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" +"for details." +msgstr "" + +msgid "Please enter a valid value.\n" +msgstr "" + +msgid "does the diffstat above look okay? " +msgstr "" + +msgid "diffstat rejected" +msgstr "" + +msgid "" +"send changesets by email\n" +"\n" +" By default, diffs are sent in the format generated by hg export,\n" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" +" introduction, which describes the series as a whole.\n" +"\n" +" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +" the first line of the changeset description as the subject text.\n" +" The message contains two or three body parts. First, the rest of\n" +" the changeset description. Next, (optionally) if the diffstat\n" +" program is installed, the result of running diffstat on the patch.\n" +" Finally, the patch itself, as generated by \"hg export\".\n" +"\n" +" With --outgoing, emails will be generated for patches not\n" +" found in the destination repository (or only those which are\n" +" ancestors of the specified revisions if any are provided)\n" +"\n" +" With --bundle, changesets are selected as for --outgoing,\n" +" but a single email containing a binary Mercurial bundle as an\n" +" attachment will be sent.\n" +"\n" +" Examples:\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +"\n" +" Before using this command, you will need to enable email in your hgrc.\n" +" See the [email] section in hgrc(5) for details.\n" +" " +msgstr "" + +msgid "Return the revisions present locally but not in dest" +msgstr "" + +msgid "specify at least one changeset with -r or -o" +msgstr "" + +msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" +msgstr "" + +msgid "too many destinations" +msgstr "" + +msgid "use only one form to specify the revision" +msgstr "" + +msgid "" +"\n" +"Write the introductory message for the patch series.\n" +"\n" +msgstr "" + +#, python-format +msgid "" +"This patch series consists of %d patches.\n" +"\n" +msgstr "" + +msgid "Final summary:\n" +msgstr "" + +msgid "Displaying " +msgstr "" + +msgid "Writing " +msgstr "" + +msgid "Sending " +msgstr "" + +msgid "send patches as attachments" +msgstr "" + +msgid "send patches as inline attachments" +msgstr "" + +msgid "email addresses of blind copy recipients" +msgstr "" + +msgid "email addresses of copy recipients" +msgstr "" + +msgid "add diffstat output to messages" +msgstr "" + +msgid "use the given date as the sending date" +msgstr "" + +msgid "use the given file as the series description" +msgstr "" + +msgid "email address of sender" +msgstr "" + +msgid "print messages that would be sent" +msgstr "" + +msgid "write messages to mbox file instead of sending them" +msgstr "" + +msgid "subject of first message (intro or single patch)" +msgstr "" + +msgid "email addresses of recipients" +msgstr "" + +msgid "omit hg patch header" +msgstr "" + +msgid "send changes not found in the target repository" +msgstr "" + +msgid "send changes not in target as a binary bundle" +msgstr "" + +msgid "a revision to send" +msgstr "" + +msgid "run even when remote repository is unrelated (with -b)" +msgstr "" + +msgid "a base changeset to specify instead of a destination (with -b)" +msgstr "" + +msgid "send an introduction email for a single patch" +msgstr "" + +msgid "hg email [OPTION]... [DEST]..." +msgstr "" + +msgid "" +"removes files not tracked by Mercurial\n" +"\n" +" Delete files not known to Mercurial. This is useful to test local and\n" +" uncommitted changes in an otherwise-clean source tree.\n" +"\n" +" This means that purge will delete:\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless they\n" +" contain files under source control managment\n" +" But it will leave untouched:\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" +"\n" +" If directories are given on the command line, only files in these\n" +" directories are considered.\n" +"\n" +" Be careful with purge, as you could irreversibly delete some files you\n" +" forgot to add to the repository. If you only want to print the list of\n" +" files that this program would delete, use the --print option.\n" +" " +msgstr "" + +#, python-format +msgid "%s cannot be removed" +msgstr "" + +#, python-format +msgid "warning: %s\n" +msgstr "" + +#, python-format +msgid "Removing file %s\n" +msgstr "正在删除文件 %s\n" + +#, python-format +msgid "Removing directory %s\n" +msgstr "正在删除目录 %s\n" + +msgid "abort if an error occurs" +msgstr "" + +msgid "purge ignored files too" +msgstr "" + +msgid "print the file names instead of deleting them" +msgstr "" + +msgid "end filenames with NUL, for use with xargs (implies -p)" +msgstr "" + +msgid "hg purge [OPTION]... [DIR]..." +msgstr "" + +msgid "" +"move sets of revisions to a different ancestor\n" +"\n" +"This extension lets you rebase changesets in an existing Mercurial " +"repository.\n" +"\n" +"For more information:\n" +"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +msgstr "" + +msgid "return the correct ancestor" +msgstr "" + +msgid "first revision, do not change ancestor\n" +msgstr "" + +msgid "" +"move changeset (and descendants) to a different branch\n" +"\n" +" Rebase uses repeated merging to graft changesets from one part of " +"history\n" +" onto another. This can be useful for linearizing local changes relative " +"to\n" +" a master development tree.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be " +"continued\n" +" with --continue or aborted with --abort.\n" +" " +msgstr "" + +msgid "cannot use both keepbranches and extrafn" +msgstr "" + +msgid "cannot use both abort and continue" +msgstr "" + +msgid "cannot use collapse with continue or abort" +msgstr "" + +msgid "abort and continue do not allow specifying revisions" +msgstr "" + +msgid "cannot specify both a revision and a base" +msgstr "" + +msgid "nothing to rebase\n" +msgstr "" + +msgid "rebase merging completed\n" +msgstr "" + +msgid "warning: new changesets detected on source branch, not stripping\n" +msgstr "" + +msgid "rebase completed\n" +msgstr "" + +#, python-format +msgid "%d revisions have been skipped\n" +msgstr "" + +msgid "" +"Skip commit if collapsing has been required and rev is not the last\n" +" revision, commit otherwise\n" +" " +msgstr "" + +msgid " set parents\n" +msgstr "" + +msgid "Rebase a single revision" +msgstr "" + +#, python-format +msgid "rebasing %d:%s\n" +msgstr "" + +#, python-format +msgid " future parents are %d and %d\n" +msgstr "" + +#, python-format +msgid " update to %d:%s\n" +msgstr "" + +msgid " already in target\n" +msgstr "" + +#, python-format +msgid " merge against %d:%s\n" +msgstr "" + +msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" +msgstr "" + +msgid "resuming interrupted rebase\n" +msgstr "" + +#, python-format +msgid "no changes, revision %d skipped\n" +msgstr "" + +#, python-format +msgid "next revision set to %s\n" +msgstr "" + +msgid "Return the new parent relationship of the revision that will be rebased" +msgstr "" + +#, python-format +msgid "cannot use revision %d as base, result would have 3 parents" +msgstr "" + +msgid "Update rebased mq patches - finalize and then import them" +msgstr "" + +#, python-format +msgid "revision %d is an mq patch (%s), finalize it.\n" +msgstr "" + +#, python-format +msgid "import mq patch %d (%s)\n" +msgstr "" + +msgid "Store the current status to allow recovery" +msgstr "" + +msgid "rebase status stored\n" +msgstr "" + +msgid "Remove the status files" +msgstr "" + +msgid "Restore a previously stored status" +msgstr "" + +msgid "rebase status resumed\n" +msgstr "" + +msgid "no rebase in progress" +msgstr "" + +msgid "Restore the repository to its original state" +msgstr "" + +msgid "warning: new changesets detected on target branch, not stripping\n" +msgstr "" + +msgid "rebase aborted\n" +msgstr "" + +msgid "Define which revisions are going to be rebased and where" +msgstr "" + +msgid "cannot rebase onto an applied mq patch" +msgstr "" + +msgid "cannot rebase an ancestor" +msgstr "" + +msgid "cannot rebase a descendant" +msgstr "" + +msgid "already working on current\n" +msgstr "" + +msgid "already working on the current branch\n" +msgstr "" + +#, python-format +msgid "rebase onto %d starting from %d\n" +msgstr "" + +msgid "unable to collapse, there is more than one external parent" +msgstr "" + +msgid "Call rebase after pull if the latter has been invoked with --rebase" +msgstr "" + +msgid "--update and --rebase are not compatible, ignoring the update flag\n" +msgstr "" + +msgid "Replace pull with a decorator to provide --rebase option" +msgstr "" + +msgid "rebase working directory to branch head" +msgstr "" + +msgid "keep original revisions" +msgstr "" + +msgid "keep original branches" +msgstr "" + +msgid "rebase from a given revision" +msgstr "" + +msgid "rebase from the base of a given revision" +msgstr "" + +msgid "rebase onto a given revision" +msgstr "" + +msgid "collapse the rebased revisions" +msgstr "" + +msgid "continue an interrupted rebase" +msgstr "" + +msgid "abort an interrupted rebase" +msgstr "" + +msgid "" +"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" +msgstr "" + +msgid "interactive change selection during commit or qrefresh" +msgstr "" + +msgid "" +"like patch.iterhunks, but yield different events\n" +"\n" +" - ('file', [header_lines + fromfile + tofile])\n" +" - ('context', [context_lines])\n" +" - ('hunk', [hunk_lines])\n" +" - ('range', (-start,len, +start,len, diffp))\n" +" " +msgstr "" + +msgid "scan lr while predicate holds" +msgstr "" + +msgid "" +"patch header\n" +"\n" +" XXX shoudn't we move this to mercurial/patch.py ?\n" +" " +msgstr "" + +msgid "this modifies a binary file (all or nothing)\n" +msgstr "" + +msgid "this is a binary file\n" +msgstr "" + +#, python-format +msgid "%d hunks, %d lines changed\n" +msgstr "" + +msgid "hunk -> (n+,n-)" +msgstr "" + +msgid "" +"patch hunk\n" +"\n" +" XXX shouldn't we merge this with patch.hunk ?\n" +" " +msgstr "" + +msgid "patch -> [] of hunks " +msgstr "" + +msgid "patch parsing state machine" +msgstr "" + +msgid "Interactively filter patch chunks into applied-only chunks" +msgstr "" + +msgid "" +"fetch next portion from chunks until a 'header' is seen\n" +" NB: header == new-file mark\n" +" " +msgstr "" + +msgid "" +"prompt query, and process base inputs\n" +"\n" +" - y/n for the rest of file\n" +" - y/n for the rest\n" +" - ? (help)\n" +" - q (quit)\n" +"\n" +" else, input is returned to the caller.\n" +" " +msgstr "" + +msgid "[Ynsfdaq?]" +msgstr "" + +msgid "y" +msgstr "" + +msgid "?" +msgstr "" + +msgid "y - record this change" +msgstr "" + +msgid "s" +msgstr "" + +msgid "f" +msgstr "" + +msgid "d" +msgstr "" + +msgid "a" +msgstr "" + +msgid "q" +msgstr "" + +msgid "user quit" +msgstr "用户退出" + +#, python-format +msgid "examine changes to %s?" +msgstr "" + +msgid " and " +msgstr "" + +#, python-format +msgid "record this change to %r?" +msgstr "" + +msgid "" +"interactively select changes to commit\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be candidates for recording.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" You will be prompted for whether to record changes to each\n" +" modified file, and for files with multiple changes, for each\n" +" change to use. For each query, the following responses are\n" +" possible:\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" +msgstr "" + +msgid "" +"interactively record a new patch\n" +"\n" +" see 'hg help qnew' & 'hg help record' for more information and usage\n" +" " +msgstr "" + +msgid "'mq' extension not loaded" +msgstr "" + +msgid "running non-interactively, use commit instead" +msgstr "" + +msgid "" +"This is generic record driver.\n" +"\n" +" It's job is to interactively filter local changes, and accordingly\n" +" prepare working dir into a state, where the job can be delegated to\n" +" non-interactive commit command such as 'commit' or 'qrefresh'.\n" +"\n" +" After the actual job is done by non-interactive command, working dir\n" +" state is restored to original.\n" +"\n" +" In the end we'll record intresting changes, and everything else will " +"be\n" +" left in place, so the user can continue his work.\n" +" " +msgstr "" + +msgid "no changes to record\n" +msgstr "" + +#, python-format +msgid "backup %r as %r\n" +msgstr "" + +msgid "applying patch\n" +msgstr "" + +msgid "patch failed to apply" +msgstr "" + +#, python-format +msgid "restoring %r to %r\n" +msgstr "" + +msgid "hg record [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qrecord [OPTION]... PATCH [FILE]..." +msgstr "" + +msgid "" +"patch transplanting tool\n" +"\n" +"This extension allows you to transplant patches from another branch.\n" +"\n" +"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" +"from a changeset hash to its hash in the source repository.\n" +msgstr "" + +msgid "" +"returns True if a node is already an ancestor of parent\n" +" or has already been transplanted" +msgstr "" + +msgid "apply the revisions in revmap one by one in revision order" +msgstr "" + +#, python-format +msgid "skipping already applied revision %s\n" +msgstr "" + +#, python-format +msgid "skipping merge changeset %s:%s\n" +msgstr "" + +#, python-format +msgid "%s merged at %s\n" +msgstr "" + +#, python-format +msgid "%s transplanted to %s\n" +msgstr "" + +msgid "arbitrarily rewrite changeset before applying it" +msgstr "" + +#, python-format +msgid "filtering %s\n" +msgstr "" + +msgid "filter failed" +msgstr "" + +msgid "apply the patch in patchfile to the repository as a transplant" +msgstr "" + +msgid "can only omit patchfile if merging" +msgstr "" + +#, python-format +msgid "%s: empty changeset" +msgstr "" + +msgid "Fix up the merge and run hg transplant --continue" +msgstr "" + +msgid "recover last transaction and apply remaining changesets" +msgstr "" + +#, python-format +msgid "%s transplanted as %s\n" +msgstr "" + +msgid "commit working directory using journal metadata" +msgstr "" + +msgid "transplant log file is corrupt" +msgstr "" + +#, python-format +msgid "working dir not at transplant parent %s" +msgstr "" + +msgid "commit failed" +msgstr "" + +msgid "journal changelog metadata for later recover" +msgstr "" + +msgid "remove changelog journal" +msgstr "" + +msgid "interactively transplant changesets" +msgstr "" + +msgid "apply changeset? [ynmpcq?]:" +msgstr "" + +msgid "" +"transplant changesets from another branch\n" +"\n" +" Selected changesets will be applied on top of the current working\n" +" directory with the log of the original changeset. If --log is\n" +" specified, log messages will have a comment appended of the form:\n" +"\n" +" (transplanted from CHANGESETHASH)\n" +"\n" +" You can rewrite the changelog message with the --filter option.\n" +" Its argument will be invoked with the current changelog message\n" +" as $1 and the patch as $2.\n" +"\n" +" If --source is specified, selects changesets from the named\n" +" repository. If --branch is specified, selects changesets from the\n" +" branch holding the named revision, up to that revision. If --all\n" +" is specified, all changesets on the branch will be transplanted,\n" +" otherwise you will be prompted to select the changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected branch\n" +" (up to the named revision) onto your current working directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as\n" +" merge changesets. You will not be prompted to transplant any\n" +" ancestors of a merged transplant, and you can merge descendants\n" +" of them normally instead of transplanting them.\n" +"\n" +" If no merges or revisions are provided, hg transplant will start\n" +" an interactive changeset browser.\n" +"\n" +" If a changeset application fails, you can fix the merge by hand and\n" +" then resume where you left off by calling hg transplant --continue.\n" +" " +msgstr "" + +msgid "--continue is incompatible with branch, all or merge" +msgstr "" + +msgid "no source URL, branch tag or revision list provided" +msgstr "" + +msgid "--all requires a branch revision" +msgstr "" + +msgid "--all is incompatible with a revision list" +msgstr "" + +msgid "no revision checked out" +msgstr "" + +msgid "outstanding uncommitted merges" +msgstr "" + +msgid "outstanding local changes" +msgstr "" + +msgid "pull patches from REPOSITORY" +msgstr "" + +msgid "pull patches from branch BRANCH" +msgstr "" + +msgid "pull all changesets up to BRANCH" +msgstr "" + +msgid "skip over REV" +msgstr "" + +msgid "merge at REV" +msgstr "" + +msgid "append transplant info to log message" +msgstr "" + +msgid "continue last transplant session after repair" +msgstr "" + +msgid "filter changesets through FILTER" +msgstr "" + +msgid "" +"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "" + +msgid "" +"allow to use MBCS path with problematic encoding.\n" +"\n" +"Some MBCS encodings are not good for some path operations\n" +"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" +"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" +"encoding\". This extension can be used to fix the issue with those\n" +"encodings by wrapping some functions to convert to unicode string\n" +"before path operation.\n" +"\n" +"This extension is usefull for:\n" +" * Japanese Windows users using shift_jis encoding.\n" +" * Chinese Windows users using big5 encoding.\n" +" * All users who use a repository with one of problematic encodings\n" +" on case-insensitive file system.\n" +"\n" +"This extension is not needed for:\n" +" * Any user who use only ascii chars in path.\n" +" * Any user who do not use any of problematic encodings.\n" +"\n" +"Note that there are some limitations on using this extension:\n" +" * You should use single encoding in one repository.\n" +" * You should set same encoding for the repository by locale or HGENCODING.\n" +"\n" +"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" +"\n" +" [extensions]\n" +" hgext.win32mbcs =\n" +"\n" +"Path encoding conversion are done between unicode and util._encoding\n" +"which is decided by mercurial from current locale setting or HGENCODING.\n" +"\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgstr "" + +msgid "[win32mbcs] cannot activate on this platform.\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] activated with encoding: %s\n" +msgstr "" + +#, python-format +msgid "" +"WARNING: %s already has %s line endings\n" +"and does not need EOL conversion by the win32text plugin.\n" +"Before your next commit, please reconsider your encode/decode settings in \n" +"Mercurial.ini or %s.\n" +msgstr "" + +#, python-format +msgid "Attempt to commit or push text file(s) using %s line endings\n" +msgstr "" + +#, python-format +msgid "in %s: %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"To prevent this mistake in your local repository,\n" +"add to Mercurial.ini or .hg/hgrc:\n" +"\n" +"[hooks]\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s\n" +"\n" +"and also consider adding:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = %sencode:\n" +"[decode]\n" +"** = %sdecode:\n" +msgstr "" + +msgid "" +"zeroconf support for mercurial repositories\n" +"\n" +"Zeroconf enabled repositories will be announced in a network without the " +"need\n" +"to configure a server or a service. They can be discovered without knowing\n" +"their actual IP address.\n" +"\n" +"To use the zeroconf extension add the following entry to your hgrc file:\n" +"\n" +"[extensions]\n" +"hgext.zeroconf =\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\" in " +"your\n" +"repository.\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\".\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" +msgstr "" + +msgid "archive prefix contains illegal components" +msgstr "" + +msgid "cannot give prefix when archiving to files" +msgstr "" + +#, python-format +msgid "unknown archive type '%s'" +msgstr "" + +msgid "invalid changegroup" +msgstr "" + +msgid "unknown parent" +msgstr "" + +#, python-format +msgid "integrity check failed on %s:%d" +msgstr "" + +#, python-format +msgid "%s: not a Mercurial bundle file" +msgstr "" + +#, python-format +msgid "%s: unknown bundle version" +msgstr "" + +#, python-format +msgid "%s: unknown bundle compression type" +msgstr "" + +msgid "cannot create new bundle repository" +msgstr "" + +#, python-format +msgid "premature EOF reading chunk (got %d bytes, expected %d)" +msgstr "" + +#, python-format +msgid "username %s contains a newline" +msgstr "" + +msgid "options --message and --logfile are mutually exclusive" +msgstr "" + +#, python-format +msgid "can't read commit message '%s': %s" +msgstr "" + +msgid "limit must be a positive integer" +msgstr "" + +msgid "limit must be positive" +msgstr "" + +msgid "too many revisions specified" +msgstr "" + +#, python-format +msgid "invalid format spec '%%%s' in output file name" +msgstr "" + +#, python-format +msgid "adding %s\n" +msgstr "" + +#, python-format +msgid "removing %s\n" +msgstr "正在删除 %s\n" + +#, python-format +msgid "recording removal of %s as rename to %s (%d%% similar)\n" +msgstr "" + +#, python-format +msgid "%s: not copying - file is not managed\n" +msgstr "" + +#, python-format +msgid "%s: not copying - file has been marked for remove\n" +msgstr "" + +#, python-format +msgid "%s: not overwriting - %s collides with %s\n" +msgstr "" + +#, python-format +msgid "%s: not overwriting - file exists\n" +msgstr "" + +#, python-format +msgid "%s: deleted in working copy\n" +msgstr "" + +#, python-format +msgid "%s: cannot copy - %s\n" +msgstr "" + +#, python-format +msgid "%s %s to %s\n" +msgstr "" + +#, python-format +msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" +msgstr "" + +msgid "no source or destination specified" +msgstr "" + +msgid "no destination specified" +msgstr "" + +msgid "with multiple sources, destination must be an existing directory" +msgstr "" + +#, python-format +msgid "destination %s is not a directory" +msgstr "" + +msgid "no files to copy" +msgstr "" + +msgid "(consider using --after)\n" +msgstr "(考虑使用 --after)\n" + +#, python-format +msgid "changeset: %d:%s\n" +msgstr "修改集: %d:%s\n" + +#, python-format +msgid "branch: %s\n" +msgstr "分支: %s\n" + +#, python-format +msgid "tag: %s\n" +msgstr "标签: %s\n" + +#, python-format +msgid "parent: %d:%s\n" +msgstr "父亲: %d:%s\n" + +#, python-format +msgid "manifest: %d:%s\n" +msgstr "清单: %d:%s\n" + +#, python-format +msgid "user: %s\n" +msgstr "用户: %s\n" + +#, python-format +msgid "date: %s\n" +msgstr "日期: %s\n" + +msgid "files+:" +msgstr "文件+:" + +msgid "files-:" +msgstr "文件-:" + +msgid "files:" +msgstr "文件:" + +#, python-format +msgid "files: %s\n" +msgstr "文件: %s\n" + +#, python-format +msgid "copies: %s\n" +msgstr "复制: %s\n" + +#, python-format +msgid "extra: %s=%s\n" +msgstr "额外: %s=%s\n" + +msgid "description:\n" +msgstr "描述:\n" + +#, python-format +msgid "summary: %s\n" +msgstr "摘要: %s\n" + +#, python-format +msgid "%s: no key named '%s'" +msgstr "" + +#, python-format +msgid "%s: %s" +msgstr "" + +#, python-format +msgid "Found revision %s from %s\n" +msgstr "" + +msgid "revision matching date not found" +msgstr "" + +#, python-format +msgid "cannot follow nonexistent file: \"%s\"" +msgstr "" + +#, python-format +msgid "%s:%s copy source revision cannot be found!\n" +msgstr "" + +msgid "can only follow copies/renames for explicit file names" +msgstr "" + +#, python-format +msgid "file %s not found!" +msgstr "" + +#, python-format +msgid "no match under directory %s!" +msgstr "" + +#, python-format +msgid "can't commit %s: unsupported file type!" +msgstr "" + +#, python-format +msgid "file %s not tracked!" +msgstr "" + +msgid "" +"add the specified files on the next commit\n" +"\n" +" Schedule files to be version controlled and added to the repository.\n" +"\n" +" The files will be added to the repository at the next commit. To\n" +" undo an add before that, see hg revert.\n" +"\n" +" If no names are given, add all files in the repository.\n" +" " +msgstr "" +"增加指定文件用于下次提交\n" +"\n" +" 调度文件受版本控制，增加到版本库。\n" +"\n" +" 这些文件将于下次提交时增加到版本库。要在提交前撤销增加，\n" +" 请参见 'hg revert'。\n" +"\n" +" 如果没有给出文件名称，就增加所有文件到版本库。\n" +" " + +msgid "" +"add all new files, delete all missing files\n" +"\n" +" Add all new files and remove all missing files from the repository.\n" +"\n" +" New files are ignored if they match any of the patterns in .hgignore. As\n" +" with add, these changes take effect at the next commit.\n" +"\n" +" Use the -s option to detect renamed files. With a parameter > 0,\n" +" this compares every removed file with every added file and records\n" +" those similar enough as renames. This option takes a percentage\n" +" between 0 (disabled) and 100 (files must be identical) as its\n" +" parameter. Detecting renamed files this way can be expensive.\n" +" " +msgstr "" + +msgid "similarity must be a number" +msgstr "" + +msgid "similarity must be between 0 and 100" +msgstr "" + +msgid "" +"show changeset information per file line\n" +"\n" +" List changes in files, showing the revision id responsible for each line\n" +"\n" +" This command is useful to discover who did a change or when a change " +"took\n" +" place.\n" +"\n" +" Without the -a option, annotate will avoid processing files it\n" +" detects as binary. With -a, annotate will generate an annotation\n" +" anyway, probably with undesirable results.\n" +" " +msgstr "" +"显示指定文件每行的改变集信息\n" +"\n" +" 列出文件中的修改，为每行显示版本标识\n" +"\n" +" 此命令用于查找谁做出的修改，或者什么时候发生的修改\n" +"\n" +" 当没有选项 '-a' 时，annotate 会避免处理检测为二进制的文件\n" +" 当使用选项 '-a' 时，annotate 会直接产生追溯，可能会有不合需要的结果\n" +" " + +msgid "at least one file name or pattern required" +msgstr "" + +msgid "at least one of -n/-c is required for -l" +msgstr "" + +#, python-format +msgid "%s: binary file\n" +msgstr "" + +msgid "" +"create unversioned archive of a repository revision\n" +"\n" +" By default, the revision used is the parent of the working\n" +" directory; use \"-r\" to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use \"-t\". Valid\n" +" types are:\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" +"\n" +" The exact name of the destination archive or directory is given\n" +" using a format string; see \"hg help export\" for details.\n" +"\n" +" Each member added to an archive file has a directory prefix\n" +" prepended. Use \"-p\" to specify a format string for the prefix.\n" +" The default is the basename of the archive, with suffixes removed.\n" +" " +msgstr "" + +msgid "no working directory: please specify a revision" +msgstr "" + +msgid "repository root cannot be destination" +msgstr "" + +msgid "cannot archive plain files to stdout" +msgstr "" + +msgid "" +"reverse effect of earlier changeset\n" +"\n" +" Commit the backed out changes as a new changeset. The new\n" +" changeset is a child of the backed out changeset.\n" +"\n" +" If you back out a changeset other than the tip, a new head is\n" +" created. This head will be the new tip and you should merge this\n" +" backout changeset with another head (current one by default).\n" +"\n" +" The --merge option remembers the parent of the working directory\n" +" before starting the backout, then merges the new head with that\n" +" changeset afterwards. This saves you from doing the merge by\n" +" hand. The result of this merge is not committed, as for a normal\n" +" merge.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "please specify just one revision" +msgstr "" + +msgid "please specify a revision to backout" +msgstr "" + +msgid "cannot back out change on a different branch" +msgstr "" + +msgid "cannot back out a change with no parents" +msgstr "" + +msgid "cannot back out a merge changeset without --parent" +msgstr "" + +#, python-format +msgid "%s is not a parent of %s" +msgstr "" + +msgid "cannot use --parent on non-merge changeset" +msgstr "" + +#, python-format +msgid "Backed out changeset %s" +msgstr "" + +#, python-format +msgid "changeset %s backs out changeset %s\n" +msgstr "" + +#, python-format +msgid "merging with changeset %s\n" +msgstr "" + +msgid "the backout changeset is a new head - do not forget to merge\n" +msgstr "" + +msgid "(use \"backout --merge\" if you want to auto-merge)\n" +msgstr "" + +msgid "" +"subdivision search of changesets\n" +"\n" +" This command helps to find changesets which introduce problems.\n" +" To use, mark the earliest changeset you know exhibits the problem\n" +" as bad, then mark the latest changeset which is free from the\n" +" problem as good. Bisect will update your working directory to a\n" +" revision for testing (unless the --noupdate option is specified).\n" +" Once you have performed tests, mark the working directory as bad\n" +" or good and bisect will either update to another candidate changeset\n" +" or announce that it has found the bad revision.\n" +"\n" +" As a shortcut, you can also use the revision argument to mark a\n" +" revision as good or bad without checking it out first.\n" +"\n" +" If you supply a command it will be used for automatic bisection. Its " +"exit\n" +" status will be used as flag to mark revision as bad or good. In case " +"exit\n" +" status is 0 the revision is marked as good, 125 - skipped, 127 (command " +"not\n" +" found) - bisection will be aborted and any other status bigger than 0 " +"will\n" +" mark revision as bad.\n" +" " +msgstr "" + +#, python-format +msgid "The first %s revision is:\n" +msgstr "" + +#, python-format +msgid "Due to skipped revisions, the first %s revision could be any of:\n" +msgstr "" + +msgid "cannot bisect (no known good revisions)" +msgstr "" + +msgid "cannot bisect (no known bad revisions)" +msgstr "" + +msgid "(use of 'hg bisect <cmd>' is deprecated)\n" +msgstr "" + +msgid "incompatible arguments" +msgstr "" + +#, python-format +msgid "failed to execute %s" +msgstr "" + +#, python-format +msgid "%s killed" +msgstr "" + +#, python-format +msgid "Changeset %s: %s\n" +msgstr "" + +#, python-format +msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgstr "" + +msgid "" +"set or show the current branch name\n" +"\n" +" With no argument, show the current branch name. With one argument,\n" +" set the working directory branch name (the branch does not exist in\n" +" the repository until the next commit).\n" +"\n" +" Unless --force is specified, branch will not let you set a\n" +" branch name that shadows an existing branch.\n" +"\n" +" Use --clean to reset the working directory branch to that of the\n" +" parent of the working directory, negating a previous branch change.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" + +#, python-format +msgid "reset working directory to branch %s\n" +msgstr "" + +msgid "a branch of the same name already exists (use --force to override)" +msgstr "" + +#, python-format +msgid "marked working directory as branch %s\n" +msgstr "" + +msgid "" +"list repository named branches\n" +"\n" +" List the repository's named branches, indicating which ones are\n" +" inactive. If active is specified, only show active branches.\n" +"\n" +" A branch is considered active if it contains repository heads.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" + +msgid "" +"create a changegroup file\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" found in the other repository.\n" +"\n" +" If no destination repository is specified the destination is\n" +" assumed to have all the nodes specified by one or more --base\n" +" parameters. To create a bundle containing all changesets, use\n" +" --all (or --base null). To change the compression method applied,\n" +" use the -t option (by default, bundles are compressed using bz2).\n" +"\n" +" The bundle file can then be transferred using conventional means and\n" +" applied to another repository with the unbundle or pull command.\n" +" This is useful when direct push and pull are not available or when\n" +" exporting an entire repository is undesirable.\n" +"\n" +" Applying bundles preserves all changeset contents including\n" +" permissions, copy/rename information, and revision history.\n" +" " +msgstr "" + +msgid "--base is incompatible with specifiying a destination" +msgstr "" + +msgid "unknown bundle type specified with --type" +msgstr "" + +msgid "" +"output the current or given revision of files\n" +"\n" +" Print the specified files as they were at the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are the same as\n" +" for the export command, with the following additions:\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repo root\n" +" %p root-relative path name of file being printed\n" +" " +msgstr "" + +msgid "" +"make a copy of an existing repository\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" The location of the source is added to the new repository's\n" +" .hg/hgrc file, as the default to be used for future pulls.\n" +"\n" +" For efficiency, hardlinks are used for cloning whenever the source\n" +" and destination are on the same filesystem (note this applies only\n" +" to the repository data, not to the checked out files). Some\n" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\n" +" using full hardlinks with\n" +"\n" +" $ cp -al REPO REPOCLONE\n" +"\n" +" This is the fastest way to clone, but it is not always safe. The\n" +" operation is not atomic (making sure REPO is not modified during\n" +" the operation is up to you) and you have to make sure your editor\n" +" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" If you use the -r option to clone up to a specific revision, no\n" +" subsequent revisions will be present in the cloned repository.\n" +" This option implies --pull, even on local repositories.\n" +"\n" +" If the -U option is used, the new clone will contain only a repository\n" +" (.hg) and no working copy (the working copy parent is the null " +"revision).\n" +"\n" +" See 'hg help urls' for valid source format details.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination, but no\n" +" .hg/hgrc and working directory will be created on the remote side.\n" +" Look at the help text for urls for important details about ssh:// URLs.\n" +" " +msgstr "" +"复制现有版本库\n" +"\n" +" 在新目录创建现有版本库的副本。\n" +"\n" +" 如果没有指定目标目录，默认使用源版本库的基本名称。\n" +"\n" +" 源版本库的位置增加到新版本库的文件 .hg/hgrc 中，作为未来更新时的默认\n" +" 位置。\n" +"\n" +" 为了效率，在复制时，只要源版本库和目标版本库位于同一文件系统，就会使\n" +" 用硬链接(注意这只适用于版本库中的数据，不适用于检出的文件)。某些文件\n" +" 系统，例如 AFS，没有正确实现硬链接，还不报告错误。在这些情况下，请使\n" +" 用选项 '--pull'来避免硬链接。\n" +"\n" +" 在某些情况下，你可以通过下述命令用硬链接复制且检出文件:\n" +"\n" +" $ cp -al REPO REPOCLONE\n" +"\n" +" 这是最快速的复制方法，但是不见得总是安全。此操作不是原子的(请确认在你\n" +" 操作期间版本库未修改)，还要确认你的编辑器会破坏硬链接。还有，它与将元\n" +" 数据放到目录 .hg 中的某些扩展不兼容，例如 mq。\n" +"\n" +" 如果你使用选项 '-r' 复制指定版本，那么后来的版本不会在新版本库中出现。\n" +" 此选项暗示 '--pull'，纵然是操作本地版本库。\n" +"\n" +" 如果你使用了选项 '-U'，那么新仓库只包含版本库(.hg)，没有工作副本。\n" +"\n" +" 参见 'hg help urls' 以了解有效源格式的详情。\n" +"\n" +" 也可以指定位置 'ssh://' 作为目标，但是不会创建文件 .hg/hgrc，并且工作\n" +" 副本将会创建在远程。参见主题 'urls' 的帮助信息，以了解位置 'ssh://'\n" +" 的重要详情。\n" +" " + +msgid "" +"commit the specified files or all outstanding changes\n" +"\n" +" Commit changes to the given files into the repository.\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be committed.\n" +"\n" +" If you are committing the result of a merge, do not provide any\n" +" file names or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is started to\n" +" enter a message.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" +"提交指定文件的修改或全部修改\n" +"\n" +" 将指定文件的修改提交到版本库。\n" +"\n" +" 如果省略了文件列表，那么 \"hg status\" 报告的所有修改都被提交。\n" +"\n" +" 如果你要提交合并结果，请不要提供任何文件名称或过滤器 '-I/-X'。\n" +"\n" +" 如果没有指定提交日志，将会启动配置的编辑器，让你输入信息。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +" " + +msgid "created new head\n" +msgstr "" + +#, python-format +msgid "committed changeset %d:%s\n" +msgstr "提交修改集 %d:%s\n" + +msgid "" +"mark files as copied for the next commit\n" +"\n" +" Mark dest as having copies of source files. If dest is a\n" +" directory, copies are put in that directory. If dest is a file,\n" +" there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a copy\n" +" before that, see hg revert.\n" +" " +msgstr "" + +msgid "find the ancestor revision of two revisions in a given index" +msgstr "" + +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "" + +msgid "either two or three arguments required" +msgstr "" + +msgid "returns the completion list associated with the given command" +msgstr "" + +msgid "rebuild the dirstate as it would look like for the given revision" +msgstr "" + +msgid "validate the correctness of the current dirstate" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but also in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in either manifest\n" +msgstr "" + +#, python-format +msgid "%s in manifest1, but listed as state %s" +msgstr "" + +msgid ".hg/dirstate inconsistent with current parent's manifest" +msgstr "" + +msgid "" +"show combined config settings from all hgrc files\n" +"\n" +" With no args, print names and values of all config items.\n" +"\n" +" With one arg of the form section.name, print just the value of\n" +" that config item.\n" +"\n" +" With multiple args, print names and values of all config items\n" +" with matching section names." +msgstr "" + +msgid "only one config item permitted" +msgstr "" + +msgid "" +"manually set the parents of the current working directory\n" +"\n" +" This is useful for writing repository conversion tools, but should\n" +" be used with care.\n" +" " +msgstr "" + +msgid "show the contents of the current dirstate" +msgstr "" + +#, python-format +msgid "copy: %s -> %s\n" +msgstr "" + +msgid "dump the contents of a data file revision" +msgstr "" + +#, python-format +msgid "invalid revision identifier %s" +msgstr "" + +msgid "parse and display a date" +msgstr "" + +msgid "dump the contents of an index file" +msgstr "" + +msgid "dump an index DAG as a .dot file" +msgstr "" + +msgid "test Mercurial installation" +msgstr "" + +#, python-format +msgid "Checking encoding (%s)...\n" +msgstr "" + +msgid " (check that your locale is properly set)\n" +msgstr "" + +msgid "Checking extensions...\n" +msgstr "" + +msgid " One or more extensions could not be found" +msgstr "" + +msgid " (check that you compiled the extensions)\n" +msgstr "" + +msgid "Checking templates...\n" +msgstr "" + +msgid " (templates seem to have been installed incorrectly)\n" +msgstr "" + +msgid "Checking patch...\n" +msgstr "" + +msgid " patch call failed:\n" +msgstr "" + +msgid " unexpected patch output!\n" +msgstr "" + +msgid " patch test failed!\n" +msgstr "" + +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. Please " +"check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://www.selenic.com/" +"mercurial/bts\n" +msgstr "" + +msgid "Checking commit editor...\n" +msgstr "" + +msgid " No commit editor set and can't find vi in PATH\n" +msgstr "" + +msgid " (specify a commit editor in your .hgrc file)\n" +msgstr "" + +#, python-format +msgid " Can't find editor '%s' in PATH\n" +msgstr "" + +msgid "Checking username...\n" +msgstr "" + +msgid " (specify a username in your .hgrc file)\n" +msgstr "" + +msgid "No problems detected\n" +msgstr "" + +#, python-format +msgid "%s problems detected, please check your install!\n" +msgstr "" + +msgid "dump rename information" +msgstr "" + +#, python-format +msgid "%s renamed from %s:%s\n" +msgstr "" + +#, python-format +msgid "%s not renamed\n" +msgstr "" + +msgid "show how files match on given patterns" +msgstr "" + +msgid "" +"diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files.\n" +"\n" +" Differences between files are shown using the unified diff format.\n" +"\n" +" NOTE: diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first parent\n" +" changeset if no revisions are specified.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent.\n" +"\n" +" Without the -a option, diff will avoid generating diffs of files\n" +" it detects as binary. With -a, diff will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +" " +msgstr "" +"在版本库中比较(指定的文件)\n" +"\n" +" 显示指定文件在版本间的差异。\n" +"\n" +" 文件间的差异使用同一差异格式显示。\n" +"\n" +" 注意: 对合并的比较可能会产生不期望的结果，因为没有指定版本时，默认\n" +" 与工作目录的直接父亲比较。\n" +"\n" +" 当给出两个版本参数时，会显示在这些版本间的修改。如果只给出一个版本，\n" +" 那么它将与工作目录比较。当没有指定版本时，将比较工作目录中的文件与\n" +" 它的直接父亲。\n" +"\n" +" 当没有选项 '-a' 时，将会避免处理检测为二进制的文件。当使用选项 '-a'\n" +" 时，可能会有不合需要的结果。\n" +"\n" +" 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n" +" 更多信息。\n" +" " + +msgid "" +"dump the header and diffs for one or more changesets\n" +"\n" +" Print the changeset header and diffs for one or more revisions.\n" +"\n" +" The information shown in the changeset header is: author,\n" +" changeset hash, parent(s) and commit comment.\n" +"\n" +" NOTE: export may generate unexpected diff output for merge changesets,\n" +" as it will compare the merge changeset against its first parent only.\n" +"\n" +" Output may be to a file, in which case the name of the file is\n" +" given using a format string. The formatting rules are as follows:\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" +"\n" +" Without the -a option, export will avoid generating diffs of files\n" +" it detects as binary. With -a, export will generate a diff anyway,\n" +" probably with undesirable results.\n" +"\n" +" Use the --git option to generate diffs in the git extended diff\n" +" format. Read the diffs help topic for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the second\n" +" parent. It can be useful to review a merge.\n" +" " +msgstr "" +"为一个或多个改变集输出标题和差异\n" +"\n" +" 为一个或多个版本输出标题和差异。\n" +"\n" +" 在改变集标题中显示的信息是: 作者，改变集哈希，父亲和提交日志。\n" +"\n" +" 注意: 对于合并改变集，导出可能产生不期望的差异输出，因为它只会将合并\n" +" 改变集与其第一个父亲比较。\n" +"\n" +" 可以输出到文件，这时会使用指定的格式化字符串构造文件名称。格式化规则\n" +" 如下:\n" +"\n" +" %% 字符 \"%\"\n" +" %H 改变集哈希 (40 位十六进制数字)\n" +" %N 产生的补丁号\n" +" %R 改变集版本号\n" +" %b 待导出的版本库的基本名称\n" +" %h 短改变集哈希(12 位十六进制数字)\n" +" %n 从 1 开始补 0 的序列号\n" +" %r 补 0 的改变集版本号\n" +"\n" +" 当没有选项 '-a' 时，将会避免处理检测为二进制的文件。当使用选项 '-a'\n" +" 时，可能会有不合需要的结果。\n" +"\n" +" 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n" +" 更多信息。\n" +"\n" +" 使用选项 '--switch-parent'，将会与第二个父亲比较。对于复审合并很有用。\n" +" " + +msgid "export requires at least one changeset" +msgstr "" + +msgid "exporting patches:\n" +msgstr "" + +msgid "exporting patch:\n" +msgstr "" + +msgid "" +"search for a pattern in specified files and revisions\n" +"\n" +" Search revisions of files for a regular expression.\n" +"\n" +" This command behaves differently than Unix grep. It only accepts\n" +" Python/Perl regexps. It searches repository history, not the\n" +" working directory. It always prints the revision number in which\n" +" a match appears.\n" +"\n" +" By default, grep only prints output for the first revision of a\n" +" file in which it finds a match. To get it to print every revision\n" +" that contains a change in match status (\"-\" for a match that\n" +" becomes a non-match, or \"+\" for a non-match that becomes a match),\n" +" use the --all flag.\n" +" " +msgstr "" + +#, python-format +msgid "grep: invalid match pattern: %s\n" +msgstr "" + +msgid "" +"show current repository heads or show branch heads\n" +"\n" +" With no arguments, show all repository head changesets.\n" +"\n" +" If branch or revisions names are given this will show the heads of\n" +" the specified branches or the branches those revisions are tagged\n" +" with.\n" +"\n" +" Repository \"heads\" are changesets that don't have child\n" +" changesets. They are where development generally takes place and\n" +" are the usual targets for update and merge operations.\n" +"\n" +" Branch heads are changesets that have a given branch tag, but have\n" +" no child changesets with that tag. They are usually where\n" +" development on the given branch takes place.\n" +" " +msgstr "" + +#, python-format +msgid "no changes on branch %s containing %s are reachable from %s\n" +msgstr "" + +#, python-format +msgid "no changes on branch %s are reachable from %s\n" +msgstr "" + +msgid "" +"show help for a given topic or a help overview\n" +"\n" +" With no arguments, print a list of commands and short help.\n" +"\n" +" Given a topic, extension, or command name, print help for that topic." +msgstr "" + +msgid "global options:" +msgstr "全局选项:" + +msgid "use \"hg help\" for the full list of commands" +msgstr "使用 \"hg help\" 获得全部命令的列表" + +msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" +msgstr "使用 \"hg help\" 获得全部命令的列表，或 \"hg -v\" 获得详细信息" + +#, python-format +msgid "use \"hg -v help%s\" to show aliases and global options" +msgstr "使用 \"hg -v help%s\" 显示别名和全局选项" + +#, python-format +msgid "use \"hg -v help %s\" to show global options" +msgstr "使用 \"hg -v help %s\" 显示全局选项" + +msgid "" +"list of commands:\n" +"\n" +msgstr "" +"命令列表:\n" +"\n" + +#, python-format +msgid "" +"\n" +"aliases: %s\n" +msgstr "" +"\n" +"别名: %s\n" + +msgid "(no help text available)" +msgstr "(没有可用的帮助信息)" + +msgid "options:\n" +msgstr "选项:\n" + +msgid "no commands defined\n" +msgstr "" + +msgid "" +"\n" +"enabled extensions:\n" +"\n" +msgstr "" +"\n" +"启用的扩展:\n" +"\n" + +#, python-format +msgid " %s %s\n" +msgstr "" + +msgid "no help text available" +msgstr "没有可用的帮助信息" + +#, python-format +msgid "%s extension - %s\n" +msgstr "" + +msgid "Mercurial Distributed SCM\n" +msgstr "分布式软件配置管理工具 - 水银\n" + +msgid "" +"basic commands:\n" +"\n" +msgstr "" +"基本命令:\n" +"\n" + +msgid "" +"\n" +"additional help topics:\n" +"\n" +msgstr "" +"\n" +"额外的帮助主题:\n" +"\n" + +msgid "" +"identify the working copy or specified revision\n" +"\n" +" With no revision, print a summary of the current state of the repo.\n" +"\n" +" With a path, do a lookup in another repository.\n" +"\n" +" This summary identifies the repository state using one or two parent\n" +" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" +" in the working directory, a list of tags for this revision and a branch\n" +" name for non-default branches.\n" +" " +msgstr "" + +msgid "" +"import an ordered set of patches\n" +"\n" +" Import a list of patches and commit them individually.\n" +"\n" +" If there are outstanding changes in the working directory, import\n" +" will abort unless given the -f flag.\n" +"\n" +" You can import a patch straight from a mail message. Even patches\n" +" as attachments work (body part must be type text/plain or\n" +" text/x-patch to be used). From and Subject headers of email\n" +" message are used as default committer and commit message. All\n" +" text/plain body parts before first diff are added to commit\n" +" message.\n" +"\n" +" If the imported patch was generated by hg export, user and description\n" +" from patch override values from message headers and body. Values\n" +" given on command line with -m and -u override these.\n" +"\n" +" If --exact is specified, import will set the working directory\n" +" to the parent of each patch before applying it, and will abort\n" +" if the resulting changeset has a different ID than the one\n" +" recorded in the patch. This may happen due to character set\n" +" problems or other deficiencies in the text patch format.\n" +"\n" +" With --similarity, hg will attempt to discover renames and copies\n" +" in the patch in the same way as 'addremove'.\n" +"\n" +" To read a patch from standard input, use patch name \"-\".\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "applying patch from stdin\n" +msgstr "" + +msgid "no diffs found" +msgstr "" + +#, python-format +msgid "" +"message:\n" +"%s\n" +msgstr "" + +msgid "not a mercurial patch" +msgstr "" + +msgid "patch is damaged or loses information" +msgstr "" + +msgid "" +"show new changesets found in source\n" +"\n" +" Show new changesets found in the specified path/URL or the default\n" +" pull location. These are the changesets that would be pulled if a pull\n" +" was requested.\n" +"\n" +" For remote repository, using --bundle avoids downloading the changesets\n" +" twice if the incoming is followed by a pull.\n" +"\n" +" See pull for valid source format details.\n" +" " +msgstr "" + +msgid "" +"create a new repository in the given directory\n" +"\n" +" Initialize a new repository in the given directory. If the given\n" +" directory does not exist, it is created.\n" +"\n" +" If no directory is given, the current directory is used.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" +"在指定目录创建新版本库\n" +"\n" +" 在指定目录初始化新版本库。如果指定的目录不存在，那么会被创建。\n" +"\n" +" 如果没有指定目录，就使用当前目录。\n" +"\n" +" 可以指定位置 'ssh://' 作为目标。参见命令 'hg help urls' 的帮助信息，\n" +" 以了解位置 'ssh://' 的重要详情。\n" +" " + +msgid "" +"locate files matching specific patterns\n" +"\n" +" Print all files under Mercurial control whose names match the\n" +" given patterns.\n" +"\n" +" This command searches the entire repository by default. To search\n" +" just the current directory and its subdirectories, use\n" +" \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints all file\n" +" names.\n" +"\n" +" If you want to feed the output of this command into the \"xargs\"\n" +" command, use the \"-0\" option to both this command and \"xargs\".\n" +" This will avoid the problem of \"xargs\" treating single filenames\n" +" that contain white space as multiple filenames.\n" +" " +msgstr "" + +msgid "" +"show revision history of entire repository or files\n" +"\n" +" Print the revision history of the specified files or the entire\n" +" project.\n" +"\n" +" File history is shown without following rename or copy history of\n" +" files. Use -f/--follow with a file name to follow history across\n" +" renames and copies. --follow without a file name will only show\n" +" ancestors or descendants of the starting revision. --follow-first\n" +" only follows the first parent of merge revisions.\n" +"\n" +" If no revision range is specified, the default is tip:0 unless\n" +" --follow is set, in which case the working directory parent is\n" +" used as the starting revision.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" By default this command outputs: changeset id and hash, tags,\n" +" non-trivial parents, user, date and time, and a summary for each\n" +" commit. When the -v/--verbose switch is used, the list of changed\n" +" files and full commit message is shown.\n" +"\n" +" NOTE: log -p may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only. Also, the files: list will only reflect files\n" +" that are different from BOTH parents.\n" +"\n" +" " +msgstr "" +"显示全部版本库或指定文件的版本历史\n" +"\n" +" 显示全部版本库或指定文件的版本历史。\n" +"\n" +" 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n" +" 会跟踪改名或复制的历史。当不给出文件名称时，使用 '--follow' 只显\n" +" 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n" +" 个父亲。\n" +"\n" +" 如果没有指定版本范围，默认是 'tip:0'。当使用 '--follow' 时，使用\n" +" 工作目录的父亲作为开始版本。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +"\n" +" 此命令缺省输出: 改变集标识和哈希，标签，父亲，提交者，日期和时间，\n" +" 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时，会显示文件\n" +" 变更列表和完整的提交信息。\n" +"\n" +" 注意: 对于合并改变集，'log -p' 可能产生不期望的差异输出，因为它只\n" +" 会将合并改变集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n" +" 文件列表。\n" +"\n" +" " + +msgid "" +"looks up all renames for a file (up to endrev) the first\n" +" time the file is given. It indexes on the changerev and only\n" +" parses the manifest if linkrev != changerev.\n" +" Returns rename info for fn at changerev rev." +msgstr "" + +msgid "" +"output the current or given revision of the project manifest\n" +"\n" +" Print a list of version controlled files for the given revision.\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" The manifest is the list of files being version controlled. If no " +"revision\n" +" is given then the first parent of the working directory is used.\n" +"\n" +" With -v flag, print file permissions, symlink and executable bits. With\n" +" --debug flag, print file revision hashes.\n" +" " +msgstr "" + +msgid "" +"merge working directory with another revision\n" +"\n" +" Merge the contents of the current working directory and the\n" +" requested revision. Files that changed between either parent are\n" +" marked as changed for the next commit and a commit must be\n" +" performed before any further updates are allowed.\n" +"\n" +" If no revision is specified, the working directory's parent is a\n" +" head revision, and the current branch contains exactly one other head,\n" +" the other head is merged with by default. Otherwise, an explicit\n" +" revision to merge with must be provided.\n" +" " +msgstr "" +"将工作目录与其它版本合并\n" +"\n" +" 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n" +" 下次提交标记为已修改，在提交之前不允许再执行更新。\n" +"\n" +" 如果没有指定版本，那么工作目录的父亲是一个合并顶点，另一个在当前分支\n" +" 中，合并后的内容是新的顶点。否则，必须明确的指定要合并的版本。\n" +" " + +#, python-format +msgid "branch '%s' has %d heads - please merge with an explicit rev" +msgstr "" + +#, python-format +msgid "branch '%s' has one head - please merge with an explicit rev" +msgstr "" + +msgid "there is nothing to merge" +msgstr "" + +#, python-format +msgid "%s - use \"hg update\" instead" +msgstr "" + +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" +msgstr "" + +msgid "" +"show changesets not found in destination\n" +"\n" +" Show changesets not found in the specified destination repository or\n" +" the default push location. These are the changesets that would be pushed\n" +" if a push was requested.\n" +"\n" +" See pull for valid destination format details.\n" +" " +msgstr "" + +msgid "" +"show the parents of the working dir or revision\n" +"\n" +" Print the working directory's parent revisions. If a\n" +" revision is given via --rev, the parent of that revision\n" +" will be printed. If a file argument is given, revision in\n" +" which the file was last changed (before the working directory\n" +" revision or the argument to --rev if given) is printed.\n" +" " +msgstr "" +"显示工作目录或指定版本的父亲\n" +"\n" +" 显示工作目录的父亲版本。如果使用 '--rev' 指定版本，就显示此版本的\n" +" 父亲。如果指定了文件，那么使用此文件最后修改的版本(工作目录的起源\n" +" 版本，或 '--rev' 指定的版本)。\n" +" " + +msgid "can only specify an explicit file name" +msgstr "" + +#, python-format +msgid "'%s' not found in manifest!" +msgstr "" + +msgid "" +"show aliases for remote repositories\n" +"\n" +" Show definition of symbolic path name NAME. If no name is given, show\n" +" definition of available names.\n" +"\n" +" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" +"\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +msgid "not found!\n" +msgstr "" + +msgid "not updating, since new heads added\n" +msgstr "" + +msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" +msgstr "" + +msgid "(run 'hg update' to get a working copy)\n" +msgstr "" + +msgid "" +"pull changes from the specified source\n" +"\n" +" Pull changes from a remote repository to a local one.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository. By default, this\n" +" does not update the copy of the project in the working directory.\n" +"\n" +" If SOURCE is omitted, the 'default' path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" +"从指定版本库取得改变集\n" +"\n" +" 从远程版本库取得改变集到本地版本库。\n" +"\n" +" 查找位于指定路径或位置的版本库的全部修改，增加到版本版本库。默认不\n" +" 更新工作目录。\n" +"\n" +" 如果没有指定位置，就使用路径 'default'。参见 'hg help urls' 以了解\n" +" 更多信息。\n" +" " + +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" + +msgid "" +"push changes to the specified destination\n" +"\n" +" Push changes from the local repository to the given destination.\n" +"\n" +" This is the symmetrical operation for pull. It helps to move\n" +" changes from the current repository to a different one. If the\n" +" destination is local this is identical to a pull in that directory\n" +" from the current one.\n" +"\n" +" By default, push will refuse to run if it detects the result would\n" +" increase the number of remote heads. This generally indicates the\n" +" the client has forgotten to pull and merge before pushing.\n" +"\n" +" If -r is used, the named changeset and all its ancestors will be pushed\n" +" to the remote repository.\n" +"\n" +" Look at the help text for urls for important details about ssh:// URLs.\n" +" If DESTINATION is omitted, a default path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" +"推送改变到指定位置\n" +"\n" +" 从本地版本库推送改变到指定位置。\n" +"\n" +" 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n" +" 是本地版本库，那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n" +" 同。\n" +"\n" +" 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n" +" 之前忘记取得远程版本库的修改，并且合并。\n" +"\n" +" 如果使用了选项 '-r'，此命名改变集以及其祖先都会被推送到远程版本库。\n" +" \n" +"\n" +" 参见主题 'urls' 的帮助信息，以了解位置 'ssh://' 的重要详情。如果没有\n" +" 给出目标位置，那么使用默认路径。参见 'hg help urls' 以了解更多信息。\n" +" " + +#, python-format +msgid "pushing to %s\n" +msgstr "正在推到 %s\n" + +msgid "" +"raw commit interface (DEPRECATED)\n" +"\n" +" (DEPRECATED)\n" +" Lowlevel commit, for use in helper scripts.\n" +"\n" +" This command is not intended to be used by normal users, as it is\n" +" primarily useful for importing from other SCMs.\n" +"\n" +" This command is now deprecated and will be removed in a future\n" +" release, please use debugsetparents and commit instead.\n" +" " +msgstr "" + +msgid "(the rawcommit command is deprecated)\n" +msgstr "" + +msgid "" +"roll back an interrupted transaction\n" +"\n" +" Recover from an interrupted commit or pull.\n" +"\n" +" This command tries to fix the repository status after an interrupted\n" +" operation. It should only be necessary when Mercurial suggests it.\n" +" " +msgstr "" + +msgid "" +"remove the specified files on the next commit\n" +"\n" +" Schedule the indicated files for removal from the repository.\n" +"\n" +" This only removes files from the current branch, not from the entire\n" +" project history. -A can be used to remove only files that have already\n" +" been deleted, -f can be used to force deletion, and -Af can be used\n" +" to remove files from the next revision without deleting them.\n" +"\n" +" The following table details the behavior of remove for different file\n" +" states (columns) and option combinations (rows). The file states are\n" +" Added, Clean, Modified and Missing (as reported by hg status). The\n" +" actions are Warn, Remove (from branch) and Delete (from disk).\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" +"\n" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" +"在下次提交时删除指定文件\n" +"\n" +" 调度从版本库删除指定文件。\n" +"\n" +" 它只从当前分支删除文件，不删除历史。'-A' 用于只移除已经删除的文\n" +" 件，'-f' 用于强制删除，'-Af' 用于从下个版本移除文件，但是不删除\n" +" 它们。\n" +"\n" +" 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n" +" ('hg status' 报告的状态)是增加(A)，干净(C)，已修改(M)，丢失(!)。\n" +" 动作是警告(W)，移除(R，从分支)，以及删除(D，从磁盘)。\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" +"\n" +" 此命令调度下次提交时删除文件。\n" +" 要在此之前撤销删除，请参见 'hg revert'。\n" +" " + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file %s (use -f to force removal)\n" +msgstr "" + +msgid "still exists" +msgstr "" + +msgid "is modified" +msgstr "" + +msgid "has been marked for add" +msgstr "" + +msgid "" +"rename files; equivalent of copy + remove\n" +"\n" +" Mark dest as copies of sources; mark sources for deletion. If\n" +" dest is a directory, copies are put in that directory. If dest is\n" +" a file, there can only be one source.\n" +"\n" +" By default, this command copies the contents of files as they\n" +" stand in the working directory. If invoked with --after, the\n" +" operation is recorded, but no copying is performed.\n" +"\n" +" This command takes effect in the next commit. To undo a rename\n" +" before that, see hg revert.\n" +" " +msgstr "" + +msgid "" +"retry file merges from a merge or update\n" +"\n" +" This command will cleanly retry unresolved file merges using file\n" +" revisions preserved from the last update or merge. To attempt to\n" +" resolve all unresolved files, use the -a switch.\n" +"\n" +" This command will also allow listing resolved files and manually\n" +" marking and unmarking files as resolved.\n" +"\n" +" The codes used to show the status of files are:\n" +" U = unresolved\n" +" R = resolved\n" +" " +msgstr "" + +msgid "too many options specified" +msgstr "" + +msgid "can't specify --all and patterns" +msgstr "" + +msgid "no files or directories specified; use --all to remerge all files" +msgstr "" + +msgid "" +"restore individual files or dirs to an earlier state\n" +"\n" +" (use update -r to check out earlier revisions, revert does not\n" +" change the working dir parents)\n" +"\n" +" With no revision specified, revert the named files or directories\n" +" to the contents they had in the parent of the working directory.\n" +" This restores the contents of the affected files to an unmodified\n" +" state and unschedules adds, removes, copies, and renames. If the\n" +" working directory has two parents, you must explicitly specify the\n" +" revision to revert to.\n" +"\n" +" Using the -r option, revert the given files or directories to their\n" +" contents as of a specific revision. This can be helpful to \"roll\n" +" back\" some or all of an earlier change.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" Revert modifies the working directory. It does not commit any\n" +" changes, or change the parent of the working directory. If you\n" +" revert to a revision other than the parent of the working\n" +" directory, the reverted files will thus appear modified\n" +" afterwards.\n" +"\n" +" If a file has been deleted, it is restored. If the executable\n" +" mode of a file was changed, it is reset.\n" +"\n" +" If names are given, all files matching the names are reverted.\n" +" If no arguments are given, no files are reverted.\n" +"\n" +" Modified files are saved with a .orig suffix before reverting.\n" +" To disable these backups, use --no-backup.\n" +" " +msgstr "" + +msgid "you can't specify a revision and a date" +msgstr "" + +msgid "no files or directories specified; use --all to revert the whole repo" +msgstr "" + +#, python-format +msgid "forgetting %s\n" +msgstr "" + +#, python-format +msgid "reverting %s\n" +msgstr "正在恢复 %s\n" + +#, python-format +msgid "undeleting %s\n" +msgstr "正在撤销删除 %s\n" + +#, python-format +msgid "saving current version of %s as %s\n" +msgstr "保存当前版本的 %s 为 %s\n" + +#, python-format +msgid "file not managed: %s\n" +msgstr "文件未被控制: %s\n" + +#, python-format +msgid "no changes needed to %s\n" +msgstr "不需要改变 %s\n" + +msgid "" +"roll back the last transaction\n" +"\n" +" This command should be used with care. There is only one level of\n" +" rollback, and there is no way to undo a rollback. It will also\n" +" restore the dirstate at the time of the last transaction, losing\n" +" any dirstate changes since that time.\n" +"\n" +" Transactions are used to encapsulate the effects of all commands\n" +" that create new changesets or propagate existing changesets into a\n" +" repository. For example, the following commands are transactional,\n" +" and their effects can be rolled back:\n" +"\n" +" commit\n" +" import\n" +" pull\n" +" push (with this repository as destination)\n" +" unbundle\n" +"\n" +" This command is not intended for use on public repositories. Once\n" +" changes are visible for pull by other users, rolling a transaction\n" +" back locally is ineffective (someone else may already have pulled\n" +" the changes). Furthermore, a race is possible with readers of the\n" +" repository; for example an in-progress pull from the repository\n" +" may fail if a rollback is performed.\n" +" " +msgstr "" + +msgid "" +"print the root (top) of the current working dir\n" +"\n" +" Print the root directory of the current repository.\n" +" " +msgstr "" + +msgid "" +"export the repository via HTTP\n" +"\n" +" Start a local HTTP repository browser and pull server.\n" +"\n" +" By default, the server logs accesses to stdout and errors to\n" +" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" " +msgstr "" +"通过 HTTP 发布版本库\n" +"\n" +" 启动本地 HTTP 版本库浏览器和发布服务器。\n" +"\n" +" 默认服务器访问日志输出到 stdout，错误日志输出到 stderr。\n" +" 可以使用选项 \"-A\" 和 \"-E\"，将这些日志输出到文件。\n" +" " + +#, python-format +msgid "listening at http://%s%s/%s (bound to %s:%d)\n" +msgstr "" + +msgid "" +"show changed files in the working directory\n" +"\n" +" Show status of files in the repository. If names are given, only\n" +" files that match are shown. Files that are clean or ignored or\n" +" source of a copy/move operation, are not listed unless -c (clean),\n" +" -i (ignored), -C (copies) or -A is given. Unless options described\n" +" with \"show only ...\" are given, the options -mardu are used.\n" +"\n" +" Option -q/--quiet hides untracked (unknown and ignored) files\n" +" unless explicitly requested with -u/--unknown or -i/-ignored.\n" +"\n" +" NOTE: status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does not\n" +" report permission changes and diff only reports changes relative\n" +" to one merge parent.\n" +"\n" +" If one revision is given, it is used as the base revision.\n" +" If two revisions are given, the difference between them is shown.\n" +"\n" +" The codes used to show the status of files are:\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = deleted, but still tracked\n" +" ? = not tracked\n" +" I = ignored\n" +" = the previous added file was copied from here\n" +" " +msgstr "" +"显示工作目录中已改变的文件\n" +"\n" +" 显示版本库中的文件状态。如果指定文件名称，只显示匹配的文件。干净的\n" +" 文件，被忽略的文件，复制/移动的源文件，不会被显示，除非使用了选项\n" +" '-c' (干净的)，'-i' (被忽略的)，'-C' (复制源) 或者 '-A' (全部)。除\n" +" 非使用了选项 \"只显示 ...\"，否则就使用选项 '-mardu'。\n" +"\n" +" 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件，除非明确地使用选\n" +" 项 '-u/--unknown' 或 ‘-i/-ignored’。\n" +"\n" +" 注意: 如果修改了权限或者执行了合并，'status' 与 'diff' 的显示可能\n" +" 不一致。标准差异格式不报告权限的改变，'diff' 只报告相对于一个合并\n" +" 父亲的改变。\n" +"\n" +" 如果给出 1 个版本，就用于基础版本。如果给出 2 个版本，就显示其差异。\n" +"\n" +" 显示文件状态的代码是:\n" +" M = 已修改\n" +" A = 已增加\n" +" R = 已移除\n" +" C = 干净的\n" +" ! = 已删除，仍旧被跟踪\n" +" ? = 未跟踪\n" +" I = 已忽略\n" +" = 早先增加的文件自此复制\n" +" " + +msgid "" +"add one or more tags for the current or given revision\n" +"\n" +" Name a particular revision using <name>.\n" +"\n" +" Tags are used to name particular revisions of the repository and are\n" +" very useful to compare different revisions, to go back to significant\n" +" earlier versions or to mark branch points as releases, etc.\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" To facilitate version control, distribution, and merging of tags,\n" +" they are stored as a file named \".hgtags\" which is managed\n" +" similarly to other project files and can be hand-edited if\n" +" necessary. The file '.hg/localtags' is used for local tags (not\n" +" shared among repositories).\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "tag names must be unique" +msgstr "" + +#, python-format +msgid "the name '%s' is reserved" +msgstr "" + +msgid "--rev and --remove are incompatible" +msgstr "" + +#, python-format +msgid "tag '%s' does not exist" +msgstr "" + +#, python-format +msgid "tag '%s' is not a %s tag" +msgstr "" + +#, python-format +msgid "Removed tag %s" +msgstr "" + +#, python-format +msgid "tag '%s' already exists (use -f to force)" +msgstr "" + +#, python-format +msgid "Added tag %s for changeset %s" +msgstr "" + +msgid "" +"list repository tags\n" +"\n" +" This lists both regular and local tags. When the -v/--verbose switch\n" +" is used, a third column \"local\" is printed for local tags.\n" +" " +msgstr "" + +msgid "" +"show the tip revision\n" +"\n" +" The tip revision (usually just called the tip) is the most\n" +" recently added changeset in the repository, the most recently\n" +" changed head.\n" +"\n" +" If you have just made a commit, that commit will be the tip. If\n" +" you have just pulled changes from another repository, the tip of\n" +" that repository becomes the current tip. The \"tip\" tag is special\n" +" and cannot be renamed or assigned to a different changeset.\n" +" " +msgstr "" + +msgid "" +"apply one or more changegroup files\n" +"\n" +" Apply one or more compressed changegroup files generated by the\n" +" bundle command.\n" +" " +msgstr "" + +msgid "" +"update working directory\n" +"\n" +" Update the repository's working directory to the specified revision,\n" +" or the tip of the current branch if none is specified. Use null as\n" +" the revision to remove the working copy (like 'hg clone -U').\n" +"\n" +" When the working dir contains no uncommitted changes, it will be\n" +" replaced by the state of the requested revision from the repo. When\n" +" the requested revision is on a different branch, the working dir\n" +" will additionally be switched to that branch.\n" +"\n" +" When there are uncommitted changes, use option -C to discard them,\n" +" forcibly replacing the state of the working dir with the requested\n" +" revision.\n" +"\n" +" When there are uncommitted changes and option -C is not used, and\n" +" the parent revision and requested revision are on the same branch,\n" +" and one of them is an ancestor of the other, then the new working\n" +" directory will contain the requested revision merged with the\n" +" uncommitted changes. Otherwise, the update will fail with a\n" +" suggestion to use 'merge' or 'update -C' instead.\n" +"\n" +" If you want to update just one file to an older revision, use revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for --date.\n" +" " +msgstr "" +"更新工作目录\n" +"\n" +" 更新工作目录到指定版本，或者到当前分支的顶点。使用 'null' 作为版本可以\n" +" 删除工作副本(类似于 'hg clone -U')。\n" +"\n" +" 当工作目录包含未提交的修改时，它会被版本库中指定版本的状态替换。当请求\n" +" 的版本位于不同分支时，工作目录会被切换到此分支。\n" +"\n" +" 可以使用选项 '-C' 来丢弃未提交的修改，强制使用请求的版本替换工作目录的\n" +" 状态。\n" +"\n" +" 当有未提交的修改，没有使用选项 '-C'，父版本和请求版本位于不同分支，并且\n" +" 其中一个是另一个的祖先时，那么新的工作目录包含请求版本与未提交的修改的\n" +" 合并结果。否则，更新会失败，建议使用 'merge' 或 'update -C'。\n" +"\n" +" 如果你只想更新一个文件到旧版本，请使用 'revert'。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +" " + +msgid "" +"verify the integrity of the repository\n" +"\n" +" Verify the integrity of the current repository.\n" +"\n" +" This will perform an extensive check of the repository's\n" +" integrity, validating the hashes and checksums of each entry in\n" +" the changelog, manifest, and tracked files, as well as the\n" +" integrity of their crosslinks and indices.\n" +" " +msgstr "" + +msgid "output version and copyright information" +msgstr "输出版本和版权信息" + +#, python-format +msgid "Mercurial Distributed SCM (version %s)\n" +msgstr "分布式软件配置管理工具 - 水银 (版本 %s)\n" + +msgid "" +"\n" +"Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" +"\n" +"版权所有 (C) 2005-2008 Matt Mackall <mpm@selenic.com> 和其他人。\n" +"这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n" +"特定目的的隐含的担保。\n" + +msgid "repository root directory or symbolic path name" +msgstr "版本库的根目录或符号路径名称" + +msgid "change working directory" +msgstr "改变工作目录" + +msgid "do not prompt, assume 'yes' for any required answers" +msgstr "不再询问，假定所有答案都是 'yes'" + +msgid "suppress output" +msgstr "抑制输出" + +msgid "enable additional output" +msgstr "启用额外的输出" + +msgid "set/override config option" +msgstr "设置/覆盖配置选项" + +msgid "enable debugging output" +msgstr "启用调试输出" + +msgid "start debugger" +msgstr "启动调试器" + +msgid "set the charset encoding" +msgstr "设置字符集编码" + +msgid "set the charset encoding mode" +msgstr "设置字符集编码模式" + +msgid "print improved command execution profile" +msgstr "显示改良的命令执行剖析" + +msgid "print traceback on exception" +msgstr "显示异常的跟踪" + +msgid "time how long the command takes" +msgstr "为命令计时" + +msgid "print command execution profile" +msgstr "显示命令执行的剖析" + +msgid "output version information and exit" +msgstr "显示版本信息后退出" + +msgid "display help and exit" +msgstr "显示帮助后退出" + +msgid "do not perform actions, just print output" +msgstr "不执行操作，只打印输出" + +msgid "specify ssh command to use" +msgstr "指定要使用的 'ssh' 命令" + +msgid "specify hg command to run on the remote side" +msgstr "指定要在远程运行的 'hg' 命令" + +msgid "include names matching the given patterns" +msgstr "包含匹配指定模式的名称" + +msgid "exclude names matching the given patterns" +msgstr "拒绝匹配指定模式的名称" + +msgid "use <text> as commit message" +msgstr "使用 <text> 作为提交日志" + +msgid "read commit message from <file>" +msgstr "从 <file> 读取提交日志" + +msgid "record datecode as commit date" +msgstr "将提供的日期作为提交日期" + +msgid "record user as committer" +msgstr "将提供的用户作为提交者" + +msgid "display using template map file" +msgstr "使用指定的样式显示" + +msgid "display with template" +msgstr "使用指定的模板显示" + +msgid "do not show merges" +msgstr "不显示合并" + +msgid "treat all files as text" +msgstr "将所有文件视为文本文件" + +msgid "don't include dates in diff headers" +msgstr "不要的差异头中包含日期" + +msgid "show which function each change is in" +msgstr "为每个修改显示在什么函数中" + +msgid "ignore white space when comparing lines" +msgstr "当比较行时忽略空白" + +msgid "ignore changes in the amount of white space" +msgstr "忽略空白数量的改变" + +msgid "ignore changes whose lines are all blank" +msgstr "忽略空行的改变" + +msgid "number of lines of context to show" +msgstr "显示几行上下文" + +msgid "guess renamed files by similarity (0<=s<=100)" +msgstr "" + +msgid "[OPTION]... [FILE]..." +msgstr "" + +msgid "annotate the specified revision" +msgstr "追溯指定版本" + +msgid "follow file copies and renames" +msgstr "处理文件复制与改名" + +msgid "list the author (long with -v)" +msgstr "列出作者 (增加 '-v' 会以长格式显示)" + +msgid "list the date (short with -q)" +msgstr "列出日期 (增加 '-q' 会以短格式显示)" + +msgid "list the revision number (default)" +msgstr "列出版本号 (默认)" + +msgid "list the changeset" +msgstr "列出改变集" + +msgid "show line number at the first appearance" +msgstr "列出首次出现时的行号" + +msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." +msgstr "" + +msgid "do not pass files through decoders" +msgstr "" + +msgid "directory prefix for files in archive" +msgstr "" + +msgid "revision to distribute" +msgstr "" + +msgid "type of distribution to create" +msgstr "" + +msgid "[OPTION]... DEST" +msgstr "" + +msgid "merge with old dirstate parent after backout" +msgstr "" + +msgid "parent to choose when backing out merge" +msgstr "" + +msgid "revision to backout" +msgstr "" + +msgid "[OPTION]... [-r] REV" +msgstr "" + +msgid "reset bisect state" +msgstr "" + +msgid "mark changeset good" +msgstr "" + +msgid "mark changeset bad" +msgstr "" + +msgid "skip testing changeset" +msgstr "" + +msgid "use command to check changeset state" +msgstr "" + +msgid "do not update to target" +msgstr "" + +msgid "[-gbsr] [-c CMD] [REV]" +msgstr "" + +msgid "set branch name even if it shadows an existing branch" +msgstr "" + +msgid "reset branch name to parent branch name" +msgstr "" + +msgid "[-fC] [NAME]" +msgstr "" + +msgid "show only branches that have unmerged heads" +msgstr "" + +msgid "[-a]" +msgstr "" + +msgid "run even when remote repository is unrelated" +msgstr "纵然远程版本库是无关的也要执行" + +msgid "a changeset up to which you would like to bundle" +msgstr "" + +msgid "a base changeset to specify instead of a destination" +msgstr "" + +msgid "bundle all changesets in the repository" +msgstr "" + +msgid "bundle compression type to use" +msgstr "" + +msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "" + +msgid "print output to file with formatted name" +msgstr "输出到使用格式化名称的文件中" + +msgid "print the given revision" +msgstr "" + +msgid "apply any matching decode filter" +msgstr "" + +msgid "[OPTION]... FILE..." +msgstr "" + +msgid "the clone will only contain a repository (no working copy)" +msgstr "只复制版本库(没有工作副本)" + +msgid "a changeset you would like to have after cloning" +msgstr "复制后你期望有的改变集" + +msgid "[OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "mark new/missing files as added/removed before committing" +msgstr "在提交之前将'新的/丢失的'文件标记为'已增加/已删除'" + +msgid "mark a branch as closed, hiding it from the branch list" +msgstr "标记一个分支已关闭，不在分支列表中显示" + +msgid "record a copy that has already occurred" +msgstr "" + +msgid "forcibly copy over an existing managed file" +msgstr "" + +msgid "[OPTION]... [SOURCE]... DEST" +msgstr "" + +msgid "[INDEX] REV1 REV2" +msgstr "" + +msgid "show the command options" +msgstr "" + +msgid "[-o] CMD" +msgstr "" + +msgid "try extended date formats" +msgstr "" + +msgid "[-e] DATE [RANGE]" +msgstr "" + +msgid "FILE REV" +msgstr "" + +msgid "[PATH]" +msgstr "" + +msgid "FILE" +msgstr "" + +msgid "parent" +msgstr "" + +msgid "file list" +msgstr "" + +msgid "revision to rebuild to" +msgstr "" + +msgid "[-r REV] [REV]" +msgstr "" + +msgid "revision to debug" +msgstr "" + +msgid "[-r REV] FILE" +msgstr "" + +msgid "REV1 [REV2]" +msgstr "" + +msgid "do not display the saved mtime" +msgstr "" + +msgid "[OPTION]..." +msgstr "" + +msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." +msgstr "" + +msgid "diff against the second parent" +msgstr "与第二个父亲比较" + +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "" + +msgid "end fields with NUL" +msgstr "" + +msgid "print all revisions that match" +msgstr "" + +msgid "follow changeset history, or file history across copies and renames" +msgstr "跟踪改变集历史，或者跟踪文件的复制与改名操作" + +msgid "ignore case when matching" +msgstr "" + +msgid "print only filenames and revs that match" +msgstr "" + +msgid "print matching line numbers" +msgstr "" + +msgid "search in given revision range" +msgstr "" + +msgid "[OPTION]... PATTERN [FILE]..." +msgstr "" + +msgid "show only heads which are descendants of rev" +msgstr "" + +msgid "show only the active heads from open branches" +msgstr "" + +msgid "[-r REV] [REV]..." +msgstr "" + +msgid "[TOPIC]" +msgstr "" + +msgid "identify the specified rev" +msgstr "" + +msgid "show local revision number" +msgstr "" + +msgid "show global revision id" +msgstr "" + +msgid "show branch" +msgstr "" + +msgid "show tags" +msgstr "" + +msgid "[-nibt] [-r REV] [SOURCE]" +msgstr "" + +msgid "" +"directory strip option for patch. This has the same\n" +"meaning as the corresponding patch option" +msgstr "" + +msgid "base path" +msgstr "" + +msgid "skip check for outstanding uncommitted changes" +msgstr "" + +msgid "don't commit, just update the working directory" +msgstr "" + +msgid "apply patch to the nodes from which it was generated" +msgstr "" + +msgid "Use any branch information in patch (implied by --exact)" +msgstr "" + +msgid "[OPTION]... PATCH..." +msgstr "" + +msgid "show newest record first" +msgstr "" + +msgid "file to store the bundles into" +msgstr "" + +msgid "a specific revision up to which you would like to pull" +msgstr "指定要取得的最高版本" + +msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" +msgstr "" + +msgid "[-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "search the repository as it stood at rev" +msgstr "" + +msgid "end filenames with NUL, for use with xargs" +msgstr "在文件名称结尾增加 NUL，用于 xargs" + +msgid "print complete paths from the filesystem root" +msgstr "" + +msgid "[OPTION]... [PATTERN]..." +msgstr "" + +msgid "only follow the first parent of merge changesets" +msgstr "只跟踪改变集的第一个父亲" + +msgid "show revs matching date spec" +msgstr "显示匹配日期的版本" + +msgid "show copied files" +msgstr "显示复制的文件" + +msgid "do case-insensitive search for a keyword" +msgstr "对关键字执行不区分大小写的搜索" + +msgid "include revs where files were removed" +msgstr "包含删除文件的版本" + +msgid "show only merges" +msgstr "只显示合并" + +msgid "revs committed by user" +msgstr "指定用户提交的版本" + +msgid "show only changesets within the given named branch" +msgstr "只显示位于指定命名分支中的改变集" + +msgid "do not display revision or any of its ancestors" +msgstr "不显示指定版本或其祖先" + +msgid "[OPTION]... [FILE]" +msgstr "" + +msgid "revision to display" +msgstr "" + +msgid "[-r REV]" +msgstr "" + +msgid "force a merge with outstanding changes" +msgstr "强制与已有修改合并" + +msgid "revision to merge" +msgstr "要合并的版本" + +msgid "[-f] [[-r] REV]" +msgstr "" + +msgid "a specific revision up to which you would like to push" +msgstr "指定你要推送的最高版本" + +msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" +msgstr "" + +msgid "show parents from the specified rev" +msgstr "从指定的版本显示父亲" + +msgid "hg parents [-r REV] [FILE]" +msgstr "" + +msgid "[NAME]" +msgstr "" + +msgid "update to new tip if changesets were pulled" +msgstr "如果有新的改变集，就更新到最新版本" + +msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "" + +msgid "force push" +msgstr "强制推送" + +msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "record delete for missing files" +msgstr "将丢失的文件视为删除" + +msgid "remove (and delete) file even if added or modified" +msgstr "删除文件，纵然它已被增加或修改" + +msgid "record a rename that has already occurred" +msgstr "记录已经发生的改名" + +msgid "[OPTION]... SOURCE... DEST" +msgstr "" + +msgid "remerge all unresolved files" +msgstr "" + +msgid "list state of files needing merge" +msgstr "" + +msgid "mark files as resolved" +msgstr "" + +msgid "unmark files as resolved" +msgstr "" + +msgid "revert all changes when no arguments given" +msgstr "" + +msgid "tipmost revision matching date" +msgstr "匹配最接近顶点的日期" + +msgid "revision to revert to" +msgstr "" + +msgid "do not save backup copies of files" +msgstr "" + +msgid "[OPTION]... [-r REV] [NAME]..." +msgstr "" + +msgid "name of access log file to write to" +msgstr "记录访问日志的文件名称" + +msgid "name of error log file to write to" +msgstr "记录错误日志的文件名称" + +msgid "port to listen on (default: 8000)" +msgstr "监听的端口(默认: 8000)" + +msgid "address to listen on (default: all interfaces)" +msgstr "监听地址(默认: 所有地址)" + +msgid "prefix path to serve from (default: server root)" +msgstr "服务路径前缀(默认: 服务器根)" + +msgid "name to show in web pages (default: working dir)" +msgstr "在 WEB 页面中显示的名称(默认: 工作目录)" + +msgid "name of the webdir config file (serve more than one repo)" +msgstr "webdir 配置文件的名称(发布多个版本库)" + +msgid "for remote clients" +msgstr "针对远程客户端" + +msgid "web templates to use" +msgstr "使用的 WEB 模板" + +msgid "template style to use" +msgstr "使用的显示样式" + +msgid "use IPv6 in addition to IPv4" +msgstr "同时使用 IPv6 和 IPv4" + +msgid "SSL certificate file" +msgstr "SSL 证书文件" + +msgid "show untrusted configuration options" +msgstr "显示不能信赖的配置选项" + +msgid "[-u] [NAME]..." +msgstr "" + +msgid "show status of all files" +msgstr "显示全部文件的状态" + +msgid "show only modified files" +msgstr "只显示已修改文件的状态" + +msgid "show only added files" +msgstr "只显示已增加文件的状态" + +msgid "show only removed files" +msgstr "只显示已移除文件的状态" + +msgid "show only deleted (but tracked) files" +msgstr "只显示已删除(但被跟踪)文件的状态" + +msgid "show only files without changes" +msgstr "只显示无改动文件的状态" + +msgid "show only unknown (not tracked) files" +msgstr "只显示未知(未被跟踪)文件的状态" + +msgid "show only ignored files" +msgstr "只显示被忽略文件的状态" + +msgid "hide status prefix" +msgstr "隐藏状态前缀" + +msgid "show source of copied files" +msgstr "显示文件的复制源" + +msgid "show difference from revision" +msgstr "显示版本差异" + +msgid "replace existing tag" +msgstr "替换已有的标签" + +msgid "make the tag local" +msgstr "标记标签为本地" + +msgid "revision to tag" +msgstr "标签对应的版本" + +msgid "remove a tag" +msgstr "删除标签" + +msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "" + +msgid "[-p]" +msgstr "" + +msgid "update to new tip if changesets were unbundled" +msgstr "" + +msgid "[-u] FILE..." +msgstr "" + +msgid "overwrite locally modified files (no backup)" +msgstr "覆盖本地修改的文件(不备份)" + +msgid "[-C] [-d DATE] [[-r] REV]" +msgstr "" + +msgid "not found in manifest" +msgstr "" + +msgid "branch name not in UTF-8!" +msgstr "" + +#, python-format +msgid " searching for copies back to rev %d\n" +msgstr "" + +#, python-format +msgid "" +" unmatched files in local:\n" +" %s\n" +msgstr "" + +#, python-format +msgid "" +" unmatched files in other:\n" +" %s\n" +msgstr "" + +msgid " all copies found (* = to merge, ! = divergent):\n" +msgstr "" + +#, python-format +msgid " %s -> %s %s\n" +msgstr "" + +msgid " checking for directory renames\n" +msgstr "" + +#, python-format +msgid " dir %s -> %s\n" +msgstr "" + +#, python-format +msgid " file %s -> %s\n" +msgstr "" + +#, python-format +msgid "'\\n' and '\\r' disallowed in filenames: %r" +msgstr "" + +#, python-format +msgid "directory %r already in dirstate" +msgstr "" + +#, python-format +msgid "file %r in dirstate clashes with %r" +msgstr "" + +#, python-format +msgid "not in dirstate: %s\n" +msgstr "" + +msgid "character device" +msgstr "" + +msgid "block device" +msgstr "" + +msgid "fifo" +msgstr "" + +msgid "socket" +msgstr "" + +msgid "directory" +msgstr "" + +#, python-format +msgid "%s: unsupported file type (type is %s)\n" +msgstr "" + +#, python-format +msgid "abort: %s\n" +msgstr "中止: %s\n" + +#, python-format +msgid "" +"hg: command '%s' is ambiguous:\n" +" %s\n" +msgstr "" + +#, python-format +msgid "timed out waiting for lock held by %s" +msgstr "" + +#, python-format +msgid "lock held by %s" +msgstr "" + +#, python-format +msgid "abort: %s: %s\n" +msgstr "中止: %s: %s\n" + +#, python-format +msgid "abort: could not lock %s: %s\n" +msgstr "中止: 不能锁定 %s: %s\n" + +#, python-format +msgid "hg %s: %s\n" +msgstr "" + +#, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format +msgid "abort: %s!\n" +msgstr "中止: %s!\n" + +#, python-format +msgid "abort: %s" +msgstr "中止: %s" + +msgid " empty string\n" +msgstr "" + +msgid "killed!\n" +msgstr "" + +#, python-format +msgid "hg: unknown command '%s'\n" +msgstr "hg: 未知命令 '%s'\n" + +#, python-format +msgid "abort: could not import module %s!\n" +msgstr "中止: 不能导入模块 %s!\n" + +msgid "(did you forget to compile extensions?)\n" +msgstr "(你是否忘记了编译扩展?)\n" + +msgid "(is your Python install correct?)\n" +msgstr "(你的 Python 安装正确吗?)\n" + +#, python-format +msgid "abort: error: %s\n" +msgstr "中止: 失败: %s\n" + +msgid "broken pipe\n" +msgstr "坏掉的管道\n" + +msgid "interrupted!\n" +msgstr "中断!\n" + +msgid "" +"\n" +"broken pipe\n" +msgstr "" +"\n" +"坏掉的管道\n" + +msgid "abort: out of memory\n" +msgstr "中止: 内存不足\n" + +msgid "** unknown exception encountered, details follow\n" +msgstr "** 遇到了未知异常，详细信息如下\n" + +msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n" + +msgid "** or mercurial@selenic.com\n" +msgstr "** 或 mercurial@selenic.com\n" + +#, python-format +msgid "** Mercurial Distributed SCM (version %s)\n" +msgstr "** 分布式软件配置管理工具 - 水银 (版本 %s)\n" + +#, python-format +msgid "** Extensions loaded: %s\n" +msgstr "** 已加载的扩展: %s\n" + +#, python-format +msgid "malformed --config option: %s" +msgstr "非法 '--config' 选项: %s" + +#, python-format +msgid "extension '%s' overrides commands: %s\n" +msgstr "扩展 '%s' 覆盖了命令: %s\n" + +msgid "Option --config may not be abbreviated!" +msgstr "选项 '--config' 不能简短!" + +msgid "Option --cwd may not be abbreviated!" +msgstr "选项 '--cwd' 不能简短!" + +msgid "" +"Option -R has to be separated from other options (i.e. not -qR) and --" +"repository may only be abbreviated as --repo!" +msgstr "" +"选项 -R 必须隔离使用(也就是不能 -qR)，并且 --repository 只能简短为 --repo!" + +#, python-format +msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" +msgstr "时间: 实际 %.3f 秒(用户 %.3f+%.3f 系统 %.3f+%.3f)\n" + +#, python-format +msgid "repository '%s' is not local" +msgstr "非本地版本库 '%s'" + +msgid "invalid arguments" +msgstr "非法参数" + +msgid "exception raised - generating profile anyway\n" +msgstr "" + +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" +"lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装" + +#, python-format +msgid "*** failed to import extension %s from %s: %s\n" +msgstr "*** 加载扩展 '%s'，自 '%s': %s\n" + +#, python-format +msgid "*** failed to import extension %s: %s\n" +msgstr "*** 加载扩展 '%s' 失败: %s\n" + +#, python-format +msgid "couldn't find merge tool %s\n" +msgstr "不能找到合并工具 '%s'\n" + +#, python-format +msgid "tool %s can't handle symlinks\n" +msgstr "工具 '%s' 不能处理符号链接\n" + +#, python-format +msgid "tool %s can't handle binary\n" +msgstr "工具 '%s' 不能处理二进制\n" + +#, python-format +msgid "tool %s requires a GUI\n" +msgstr "工具 '%s' 需要 GUI\n" + +#, python-format +msgid "picked tool '%s' for %s (binary %s symlink %s)\n" +msgstr "选择工具 '%s'，用于 %s(二进制 %s 符号链接 %s)\n" + +#, python-format +msgid "" +" no tool found to merge %s\n" +"keep (l)ocal or take (o)ther?" +msgstr "" +" 没有找到工具合并 %s\n" +"使用本地(l)或者他人(o)的内容?" + +msgid "[lo]" +msgstr "" + +msgid "l" +msgstr "" + +#, python-format +msgid "merging %s and %s to %s\n" +msgstr "" + +#, python-format +msgid "merging %s\n" +msgstr "" + +#, python-format +msgid "my %s other %s ancestor %s\n" +msgstr "" + +msgid " premerge successful\n" +msgstr "" + +#, python-format +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +msgid "[yn]" +msgstr "" + +msgid "n" +msgstr "" + +#, python-format +msgid "merging %s failed!\n" +msgstr "" + +#, python-format +msgid "Inconsistent state, %s:%s is good and bad" +msgstr "" + +#, python-format +msgid "unknown bisect kind %s" +msgstr "" + +msgid "Date Formats" +msgstr "" + +msgid "" +"\n" +" Some commands allow the user to specify a date, e.g.:\n" +" * backout, commit, import, tag: Specify the commit date.\n" +" * log, revert, update: Select revision(s) by date.\n" +"\n" +" Many date formats are valid. Here are some examples:\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +" Lastly, there is Mercurial's internal format:\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +" This is the internal representation format for dates. unixtime is\n" +" the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n" +" is the offset of the local timezone, in seconds west of UTC (negative\n" +" if the timezone is east of UTC).\n" +"\n" +" The log command also accepts date ranges:\n" +"\n" +" \"<{date}\" - on or before a given date\n" +" \">{date}\" - on or after a given date\n" +" \"{date} to {date}\" - a date range, inclusive\n" +" \"-{days}\" - within a given number of days of today\n" +" " +msgstr "" + +msgid "File Name Patterns" +msgstr "" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying one or more\n" +" files at a time.\n" +"\n" +" By default, Mercurial treats filenames as shell-style extended\n" +" glob patterns.\n" +"\n" +" Alternate pattern notations must be specified explicitly.\n" +"\n" +" To use a plain path name without any pattern matching, start a\n" +" name with \"path:\". These path names must match completely, from\n" +" the root of the current repository.\n" +"\n" +" To use an extended glob, start a name with \"glob:\". Globs are\n" +" rooted at the current directory; a glob such as \"*.c\" will match\n" +" files ending in \".c\" in the current directory only.\n" +"\n" +" The supported glob syntax extensions are \"**\" to match any string\n" +" across path separators, and \"{a,b}\" to mean \"a or b\".\n" +"\n" +" To use a Perl/Python regular expression, start a name with \"re:\".\n" +" Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +" Plain examples:\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root of\n" +" the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +" Glob examples:\n" +"\n" +" glob:*.c any name ending in \".c\" in the current directory\n" +" *.c any name ending in \".c\" in the current directory\n" +" **.c any name ending in \".c\" in the current directory, or\n" +" any subdirectory\n" +" foo/*.c any name ending in \".c\" in the directory foo\n" +" foo/**.c any name ending in \".c\" in the directory foo, or any\n" +" subdirectory\n" +"\n" +" Regexp examples:\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +"\n" +" " +msgstr "" + +msgid "Environment Variables" +msgstr "" + +msgid "" +"\n" +"HG::\n" +" Path to the 'hg' executable, automatically passed when running hooks,\n" +" extensions or external tools. If unset or empty, an executable named\n" +" 'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n" +"\n" +"HGEDITOR::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING::\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE::\n" +" This sets Mercurial's behavior for handling unknown characters\n" +" while transcoding user inputs. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't translate a character. Other\n" +" settings include \"replace\", which replaces unknown characters, and\n" +" \"ignore\", which drops them. This setting can be overridden with\n" +" the --encodingmode command-line option.\n" +"\n" +"HGMERGE::\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGRCPATH::\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only .hg/hgrc of\n" +" current repository is read.\n" +"\n" +" For each element in path, if a directory, all entries in directory\n" +" ending with \".rc\" are added to path. Else, element itself is\n" +" added to path.\n" +"\n" +"HGUSER::\n" +" This is the string used for the author of a commit.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL::\n" +" If HGUSER is not set, this will be used as the author for a commit.\n" +"\n" +"LOGNAME::\n" +" If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n" +" '@hostname' appended) as the author value for a commit.\n" +"\n" +"VISUAL::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"EDITOR::\n" +" Sometimes Mercurial needs to open a text file in an editor\n" +" for a user to modify, for example when writing commit messages.\n" +" The editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH::\n" +" This is used by Python to find imported modules and may need to be set\n" +" appropriately if Mercurial is not installed system-wide.\n" +" " +msgstr "" + +msgid "Specifying Single Revisions" +msgstr "" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying individual\n" +" revisions.\n" +"\n" +" A plain integer is treated as a revision number. Negative\n" +" integers are treated as offsets from the tip, with -1 denoting the\n" +" tip.\n" +"\n" +" A 40-digit hexadecimal string is treated as a unique revision\n" +" identifier.\n" +"\n" +" A hexadecimal string less than 40 characters long is treated as a\n" +" unique revision identifier, and referred to as a short-form\n" +" identifier. A short-form identifier is only valid if it is the\n" +" prefix of one full-length identifier.\n" +"\n" +" Any other string is treated as a tag name, which is a symbolic\n" +" name associated with a revision identifier. Tag names may not\n" +" contain the \":\" character.\n" +"\n" +" The reserved name \"tip\" is a special tag that always identifies\n" +" the most recent revision.\n" +"\n" +" The reserved name \"null\" indicates the null revision. This is the\n" +" revision of an empty repository, and the parent of revision 0.\n" +"\n" +" The reserved name \".\" indicates the working directory parent. If\n" +" no working directory is checked out, it is equivalent to null.\n" +" If an uncommitted merge is in progress, \".\" is the revision of\n" +" the first parent.\n" +" " +msgstr "" + +msgid "Specifying Multiple Revisions" +msgstr "指定多个版本" + +msgid "" +"\n" +" When Mercurial accepts more than one revision, they may be\n" +" specified individually, or provided as a continuous range,\n" +" separated by the \":\" character.\n" +"\n" +" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" +" are revision identifiers. Both BEGIN and END are optional. If\n" +" BEGIN is not specified, it defaults to revision number 0. If END\n" +" is not specified, it defaults to the tip. The range \":\" thus\n" +" means \"all revisions\".\n" +"\n" +" If BEGIN is greater than END, revisions are treated in reverse\n" +" order.\n" +"\n" +" A range acts as a closed interval. This means that a range of 3:5\n" +" gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.\n" +" " +msgstr "" +"\n" +" 当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的连续范围\n" +" 格式提供。\n" +"\n" +" 范围的语法是 '[BEGIN]:[END]'，其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n" +" 和 'END' 都是可选的。'BEGIN' 默认是 0，'END' 默认是 'tip'。因此范围 \":" +"\"\n" +" 意味着全部版本。\n" +"\n" +" 如果 'BEGIN' 大于 'END'，版本视为反序。\n" +"\n" +" 范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '4:2' 是 '4'，\n" +" '3'，'2'。\n" +" " + +msgid "Diff Formats" +msgstr "差异格式" + +msgid "" +"\n" +" Mercurial's default format for showing changes between two versions\n" +" of a file is compatible with the unified format of GNU diff, which\n" +" can be used by GNU patch and many other standard tools.\n" +"\n" +" While this standard format is often enough, it does not encode the\n" +" following information:\n" +"\n" +" - executable status\n" +" - copy or rename information\n" +" - changes in binary files\n" +" - creation or deletion of empty files\n" +"\n" +" Mercurial also supports the extended diff format from the git VCS\n" +" which addresses these limitations. The git diff format is not\n" +" produced by default because there are very few tools which\n" +" understand this format.\n" +"\n" +" This means that when generating diffs from a Mercurial repository\n" +" (e.g. with \"hg export\"), you should be careful about things like\n" +" file copies and renames or other things mentioned above, because\n" +" when applying a standard diff to a different repository, this extra\n" +" information is lost. Mercurial's internal operations (like push and\n" +" pull) are not affected by this, because they use an internal binary\n" +" format for communicating changes.\n" +"\n" +" To make Mercurial produce the git extended diff format, use the\n" +" --git option available for many commands, or set 'git = True' in the\n" +" [diff] section of your hgrc. You do not need to set this option when\n" +" importing diffs in this format or using them in the mq extension.\n" +" " +msgstr "" +"\n" +" 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容，可用于\n" +" GNU patch 和许多标准工具。\n" +"\n" +" 虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:\n" +"\n" +" - 可执行状态\n" +" - 复制或改名信息\n" +" - 二进制文件的修改\n" +" - 创建或删除空文件\n" +"\n" +" 水银也支持解决这些限制的 git 扩展差异格式。由于支持 git 差异格式的工具\n" +" 很少，所以它不是默认格式。\n" +"\n" +" 这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用标\n" +" 准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n" +" 操作(例如 push 和 pull)在传达改变时，使用内部的二进制格式，所以不受影\n" +" 响。\n" +"\n" +" 要让水银产生 git 扩展差异格式，可以对许多命令使用选项 '--git'，或者在\n" +" 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时，\n" +" 或在 mq 扩展中使用时，不需要设置此选项。\n" +" " + +msgid "Template Usage" +msgstr "模版用法" + +msgid "" +"\n" +" Mercurial allows you to customize output of commands through\n" +" templates. You can either pass in a template from the command line,\n" +" via the --template option, or select an existing template-style (--" +"style).\n" +"\n" +" You can customize output for any \"log-like\" command: log, outgoing,\n" +" incoming, tip, parents, heads and glog are all template-enabled.\n" +"\n" +" Three styles are packaged with Mercurial: default (the style used\n" +" when no explicit preference is passed), compact and changelog. Usage:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" A template is a piece of text, with markup to invoke variable expansion:\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" Strings in curly braces are called keywords. The availability of\n" +" keywords depends on the exact context of the templater. These keywords\n" +" are usually available for templating a log-like command:\n" +"\n" +" - author: String. The unmodified author of the changeset.\n" +" - branches: String. The name of the branch on which the changeset\n" +" was committed. Will be empty if the branch name was default.\n" +" - date: Date information. The date when the changeset was committed.\n" +" - desc: String. The text of the changeset description.\n" +" - files: List of strings. All files modified, added, or removed by\n" +" this changeset.\n" +" - file_adds: List of strings. Files added by this changeset.\n" +" - file_mods: List of strings. Files modified by this changeset.\n" +" - file_dels: List of strings. Files removed by this changeset.\n" +" - node: String. The changeset identification hash, as a 40-character\n" +" hexadecimal string.\n" +" - parents: List of strings. The parents of the changeset.\n" +" - rev: Integer. The repository-local changeset revision number.\n" +" - tags: List of strings. Any tags associated with the changeset.\n" +"\n" +" The \"date\" keyword does not produce human-readable output. If you\n" +" want to use a date in your output, you can use a filter to process it.\n" +" Filters are functions which return a string based on the input variable.\n" +" You can also use a chain of filters to get the wanted output:\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" List of filters:\n" +"\n" +" - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" +" every line except the last.\n" +" - age: Date. Returns a human-readable age for the given date.\n" +" - basename: Any text. Treats the text as a path, and returns the\n" +" basename. For example, \"foo/bar/baz\" becomes \"baz\".\n" +" - date: Date. Returns a date in a Unix date command format, including\n" +" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" +" - domain: Any text. Finds the first string that looks like an email\n" +" address, and extracts just the domain component.\n" +" - email: Any text. Extracts the first string that looks like an email\n" +" address.\n" +" - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" +" \"<\" and \">\" with XML entities.\n" +" - fill68: Any text. Wraps the text to fit in 68 columns.\n" +" - fill76: Any text. Wraps the text to fit in 76 columns.\n" +" - firstline: Any text. Returns the first line of text.\n" +" - hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +" - isodate: Date. Returns the date in ISO 8601 format.\n" +" - obfuscate: Any text. Returns the input text rendered as a sequence\n" +" of XML entities.\n" +" - person: Any text. Returns the text before an email address.\n" +" - rfc822date: Date. Returns a date using the same format used\n" +" in email headers.\n" +" - short: Changeset hash. Returns the short form of a changeset hash,\n" +" i.e. a 12-byte hexadecimal string.\n" +" - shortdate: Date. Returns a date like \"2006-09-04\".\n" +" - strip: Any text. Strips all leading and trailing whitespace.\n" +" - tabindent: Any text. Returns the text, with every line except the\n" +" first starting with a tab character.\n" +" - urlescape: Any text. Escapes all \"special\" characters. For example,\n" +" \"foo bar\" becomes \"foo%20bar\".\n" +" - user: Any text. Returns the user portion of an email address.\n" +" " +msgstr "" +"\n" +" 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" +" 来使用模版，或者选择已有的模版样式(--style)。\n" +"\n" +" 你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n" +" tip，parents，heads 和 glog 这些启用模版的命令。\n" +"\n" +" 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" 模版是文本片断，其中的标记用于变量扩展:\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n" +" 可用于输出与日志信息类似的命令:\n" +"\n" +" - author: 字符串。改变集的作者。\n" +" - branches: 字符串。改变集的分支。如果分支名称为 'default' 则为空。\n" +" - date: 日期信息。改变集的日期。\n" +" - desc: 字符串。改变集的描述。\n" +" - files: 字符串列表。改变集中被修改、增加和删除的全部文件。\n" +" - file_adds: 字符串列表。改变集中被增加的文件。\n" +" - file_mods: 字符串列表。改变集中被修改的文件\n" +" - file_dels: 字符串列表。改变集中被删除的文件\n" +" - node: 字符串。改变集的哈系标识，40 个字符的 16 进制字符串。\n" +" - parents: 字符串列表。改变集的父亲。\n" +" - rev: 整数。本地版本库的改变集的版本号。\n" +" - tags: 字符串列表。改变集的标签。\n" +"\n" +" 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期，可以使用\n" +" 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" +" 链来产生需要的输出:\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" 过滤器列表:\n" +"\n" +" - addbreaks: 输入任意文本。除了最后一行，在每行的结尾增加 XHTML 标签\n" +" \"<br />\"。\n" +" - age: 输入日期。返回指定日期的人工可读的字符串。\n" +" - basename: 输入任意文本。将输入视为路径，返回基础名称。例如\n" +" \"foo/bar/baz\" 成为 \"baz\"。\n" +" - date: 输入日期。返回指定日期的 Unix 命令 'date' 格式字符串，包含时\n" +" 区，例如: \"Mon Sep 04 15:13:13 2006 0700\"。\n" +" - domain: 输入任意文本。找到第一个 email 地址，返回其域名。\n" +" - email: 输入任意文本。返回第一个 email 地址。\n" +" - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\"，\n" +" \"<\" 和 \">\"。\n" +" - fill68: 输入任意文本。格式化为 68 列文本。\n" +" - fill76: 输入任意文本。格式化为 76 列文本。\n" +" - firstline: 输入任意文本。返回首行。\n" +" - hgdate: 输入日期。返回一对数字:\n" +" \"1157407993 25200\" (Unix 时戳，时区偏移)。\n" +" - isodate: 输入日期。返回 ISO 8601 格式的日期。\n" +" - obfuscate: 输入任意文本。返回其 XML 实体序列。\n" +" - person: 输入任意文本。返回 email 地址前的文本。\n" +" - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n" +" - short: 改变集哈系。返回改变集哈系的短格式。例如 12 字符的 16 进制\n" +" 字符串。\n" +" - shortdate: 输入日期。返回格式类似于 \"2006-09-04\"。\n" +" - strip: 输入任意文本。删除全部行首与行尾空白。\n" +" - tabindent: 输入任意文本。除了首行，在每行的开始增加制表符号。\n" +" - urlescape: 输入任意文本。封装全部特殊字符。例如\n" +" \"foo bar\" 成为 \"foo%20bar\"。\n" +" - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" +" " + +msgid "Url Paths" +msgstr "统一资源定位路径" + +msgid "" +"\n" +" Valid URLs are of the form:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" Paths in the local filesystem can either point to Mercurial\n" +" repositories or to bundle files (as created by 'hg bundle' or\n" +" 'hg incoming --bundle').\n" +"\n" +" An optional identifier after # indicates a particular branch, tag,\n" +" or changeset to deal with in the remote repository.\n" +"\n" +" Some features, such as pushing to http:// and https:// URLs are\n" +" only possible if the feature is explicitly enabled on the\n" +" remote Mercurial server.\n" +"\n" +" Some notes about using SSH with Mercurial:\n" +" - SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +" - path is relative to the remote user's home directory by default.\n" +" Use an extra slash at the start of a path to specify an absolute path:\n" +" ssh://example.com//tmp/repository\n" +" - Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +" These urls can all be stored in your hgrc with path aliases under the\n" +" [paths] section like so:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" You can then use the alias for any command that uses a url (for example\n" +" 'hg pull alias1' would pull from the 'alias1' path).\n" +"\n" +" Two path aliases are more important because they are used as defaults\n" +" when you do not provide the url to a command:\n" +"\n" +" default:\n" +" When you create a repository with hg clone, the clone command saves\n" +" the location of the source repository as the 'default' path. This is\n" +" then used when you omit a path from the push and pull commands.\n" +"\n" +" default-push:\n" +" The push command will look for a path named 'default-push', and\n" +" prefer it over 'default' if both are defined.\n" +" " +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的分支，标签或改变集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名特别重要:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的路径保存\n" +" 为别名 'default'，然后你可以对命令 'push' 和 'pull' 省略路径。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, python-format +msgid "destination directory: %s\n" +msgstr "目标目录: %s\n" + +#, python-format +msgid "destination '%s' already exists" +msgstr "" + +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" +msgstr "" + +msgid "clone from remote to remote not supported" +msgstr "" + +msgid "updating working directory\n" +msgstr "正在更新工作目录\n" + +msgid "updated" +msgstr "已更新" + +msgid "merged" +msgstr "已合并" + +msgid "removed" +msgstr "已删除" + +msgid "unresolved" +msgstr "未解决" + +#, python-format +msgid "%d files %s" +msgstr "%d 个文件%s" + +msgid "use 'hg resolve' to retry unresolved file merges\n" +msgstr "" + +msgid "(branch merge, don't forget to commit)\n" +msgstr "" + +#, python-format +msgid "error reading %s/.hg/hgrc: %s\n" +msgstr "" + +msgid "SSL support is unavailable" +msgstr "" + +msgid "IPv6 not available on this system" +msgstr "" + +#, python-format +msgid "cannot start server at '%s:%d': %s" +msgstr "" + +#, python-format +msgid "calling hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" not in a module)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (import of \"%s\" failed)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not defined)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not callable)" +msgstr "" + +#, python-format +msgid "error: %s hook failed: %s\n" +msgstr "" + +#, python-format +msgid "error: %s hook raised an exception: %s\n" +msgstr "" + +#, python-format +msgid "%s hook failed" +msgstr "" + +#, python-format +msgid "warning: %s hook failed\n" +msgstr "" + +#, python-format +msgid "running hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook %s" +msgstr "" + +#, python-format +msgid "warning: %s hook %s\n" +msgstr "" + +msgid "connection ended unexpectedly" +msgstr "" + +#, python-format +msgid "unsupported URL component: \"%s\"" +msgstr "" + +#, python-format +msgid "using %s\n" +msgstr "使用 %s\n" + +#, python-format +msgid "capabilities: %s\n" +msgstr "" + +msgid "operation not supported over http" +msgstr "" + +#, python-format +msgid "sending %s command\n" +msgstr "发送命令 '%s'\n" + +#, python-format +msgid "sending %s bytes\n" +msgstr "发送 %s 字节\n" + +msgid "authorization failed" +msgstr "授权失败" + +#, python-format +msgid "http error while sending %s command\n" +msgstr "" + +msgid "http error, possibly caused by proxy setting" +msgstr "" + +#, python-format +msgid "real URL is %s\n" +msgstr "实际 URL 是 '%s'\n" + +#, python-format +msgid "Requested URL: '%s'\n" +msgstr "请求的 URL: '%s'\n" + +#, python-format +msgid "'%s' does not appear to be an hg repository" +msgstr "'%s' 似乎不是水银版本库" + +#, python-format +msgid "'%s' sent a broken Content-Type header (%s)" +msgstr "" + +#, python-format +msgid "'%s' uses newer protocol %s" +msgstr "" + +msgid "look up remote revision" +msgstr "" + +msgid "unexpected response:" +msgstr "" + +msgid "look up remote changes" +msgstr "" + +msgid "push failed (unexpected response):" +msgstr "" + +#, python-format +msgid "push failed: %s" +msgstr "" + +msgid "Python support for SSL and HTTPS is not installed" +msgstr "" + +msgid "cannot create new http repository" +msgstr "" + +#, python-format +msgid "%s: ignoring invalid syntax '%s'\n" +msgstr "" + +#, python-format +msgid "skipping unreadable ignore file '%s': %s\n" +msgstr "" + +#, python-format +msgid "repository %s not found" +msgstr "" + +#, python-format +msgid "repository %s already exists" +msgstr "版本库 %s 已存在" + +#, python-format +msgid "requirement '%s' not supported" +msgstr "" + +#, python-format +msgid "%r cannot be used in a tag name" +msgstr "" + +msgid "working copy of .hgtags is changed (please commit .hgtags manually)" +msgstr "" + +#, python-format +msgid "%s, line %s: %s\n" +msgstr "" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + +#, python-format +msgid "tag '%s' refers to unknown node" +msgstr "" + +#, python-format +msgid "unknown revision '%s'" +msgstr "" + +#, python-format +msgid "filtering %s through %s\n" +msgstr "" + +msgid "journal already exists - run hg recover" +msgstr "" + +msgid "rolling back interrupted transaction\n" +msgstr "回滚中断的事务\n" + +msgid "no interrupted transaction available\n" +msgstr "" + +msgid "rolling back last transaction\n" +msgstr "回滚最近的事务\n" + +#, python-format +msgid "Named branch could not be reset, current branch still is: %s\n" +msgstr "" + +msgid "no rollback information available\n" +msgstr "没有回滚信息可用\n" + +#, python-format +msgid "waiting for lock on %s held by %r\n" +msgstr "" + +#, python-format +msgid "repository %s" +msgstr "" + +#, python-format +msgid "working directory of %s" +msgstr "" + +#, python-format +msgid " %s: searching for copy revision for %s\n" +msgstr "" + +#, python-format +msgid " %s: copy %s:%s\n" +msgstr "" + +msgid "cannot partially commit a merge (do not specify files or patterns)" +msgstr "" + +#, python-format +msgid "%s not tracked!\n" +msgstr "%s 没有被跟踪!\n" + +msgid "unresolved merge conflicts (see hg resolve)" +msgstr "未解决的合并冲突(参见 'hg resolve')" + +msgid "nothing changed\n" +msgstr "没有改变\n" + +#, python-format +msgid "trouble committing %s!\n" +msgstr "提交 '%s' 出错!\n" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。" + +msgid "empty commit message" +msgstr "空的提交日志" + +#, python-format +msgid "%s does not exist!\n" +msgstr "%s 不存在!\n" + +#, python-format +msgid "" +"%s: files over 10MB may cause memory and performance problems\n" +"(use 'hg revert %s' to unadd the file)\n" +msgstr "" + +#, python-format +msgid "%s not added: only files and symlinks supported currently\n" +msgstr "" + +#, python-format +msgid "%s already tracked!\n" +msgstr "" + +#, python-format +msgid "%s not added!\n" +msgstr "" + +#, python-format +msgid "%s still exists!\n" +msgstr "" + +#, python-format +msgid "%s not removed!\n" +msgstr "" + +#, python-format +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "" + +msgid "searching for changes\n" +msgstr "正在搜索修改\n" + +#, python-format +msgid "examining %s:%s\n" +msgstr "" + +msgid "branch already found\n" +msgstr "" + +#, python-format +msgid "found incomplete branch %s:%s\n" +msgstr "" + +#, python-format +msgid "found new changeset %s\n" +msgstr "" + +#, python-format +msgid "request %d: %s\n" +msgstr "" + +#, python-format +msgid "received %s:%s\n" +msgstr "" + +#, python-format +msgid "narrowing %d:%d %s\n" +msgstr "" + +#, python-format +msgid "found new branch changeset %s\n" +msgstr "" + +#, python-format +msgid "narrowed branch search to %s:%s\n" +msgstr "" + +msgid "already have changeset " +msgstr "" + +msgid "warning: repository is unrelated\n" +msgstr "" + +msgid "repository is unrelated" +msgstr "" + +msgid "found new changesets starting at " +msgstr "" + +#, python-format +msgid "%d total queries\n" +msgstr "" + +msgid "common changesets up to " +msgstr "" + +msgid "requesting all changes\n" +msgstr "正在请求全部修改\n" + +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." +msgstr "" + +msgid "abort: push creates new remote heads!\n" +msgstr "" + +msgid "(did you forget to merge? use push -f to force)\n" +msgstr "" + +msgid "note: unsynced remote changes!\n" +msgstr "" + +#, python-format +msgid "%d changesets found\n" +msgstr "已发现 %d 个改变集\n" + +msgid "list of changesets:\n" +msgstr "" + +#, python-format +msgid "empty or missing revlog for %s" +msgstr "" + +#, python-format +msgid "add changeset %s\n" +msgstr "" + +msgid "adding changesets\n" +msgstr "正在增加修改集\n" + +msgid "received changelog group is empty" +msgstr "" + +msgid "adding manifests\n" +msgstr "正在增加清单\n" + +msgid "adding file changes\n" +msgstr "正在增加文件改变\n" + +#, python-format +msgid "adding %s revisions\n" +msgstr "" + +msgid "received file revlog group is empty" +msgstr "" + +#, python-format +msgid " (%+d heads)" +msgstr "" + +#, python-format +msgid "added %d changesets with %d changes to %d files%s\n" +msgstr "已增加 %d 个改变集，包含 %d 个改变，修改了 %d 个文件%s\n" + +msgid "updating the branch cache\n" +msgstr "" + +msgid "Unexpected response from remote server:" +msgstr "" + +msgid "operation forbidden by server" +msgstr "" + +msgid "locking the remote repository failed" +msgstr "" + +msgid "the server sent an unknown error code" +msgstr "" + +msgid "streaming all changes\n" +msgstr "" + +#, python-format +msgid "%d files to transfer, %s of data\n" +msgstr "" + +#, python-format +msgid "adding %s (%s)\n" +msgstr "" + +#, python-format +msgid "transferred %s in %.1f seconds (%s/sec)\n" +msgstr "" + +msgid "no [smtp]host in hgrc - cannot send mail" +msgstr "" + +#, python-format +msgid "sending mail: smtp host %s, port %s\n" +msgstr "" + +msgid "can't use TLS: Python SSL support not installed" +msgstr "" + +msgid "(using tls)\n" +msgstr "" + +#, python-format +msgid "(authenticating to mail server as %s)\n" +msgstr "" + +#, python-format +msgid "sending mail: %s\n" +msgstr "" + +msgid "smtp specified as email transport, but no smtp host configured" +msgstr "" + +#, python-format +msgid "%r specified as email transport, but not in PATH" +msgstr "" + +#, python-format +msgid "ignoring invalid sendcharset: %s\n" +msgstr "" + +#, python-format +msgid "invalid email address: %s" +msgstr "" + +#, python-format +msgid "invalid local address: %s" +msgstr "" + +msgid "'\\n' and '\\r' disallowed in filenames" +msgstr "" + +#, python-format +msgid "failed to remove %s from manifest" +msgstr "" + +#, python-format +msgid "diff context lines count must be an integer, not %r" +msgstr "" + +#, python-format +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" +msgstr "" + +#, python-format +msgid "case-folding collision between %s and %s" +msgstr "" + +msgid "resolving manifests\n" +msgstr "正在解析清单\n" + +#, python-format +msgid " overwrite %s partial %s\n" +msgstr "" + +#, python-format +msgid " ancestor %s local %s remote %s\n" +msgstr "" + +#, python-format +msgid "" +" conflicting flags for %s\n" +"(n)one, e(x)ec or sym(l)ink?" +msgstr "" + +#, python-format +msgid "" +" local changed %s which remote deleted\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +msgid "[cd]" +msgstr "" + +msgid "c" +msgstr "" + +#, python-format +msgid "" +"remote changed %s which local deleted\n" +"use (c)hanged version or leave (d)eleted?" +msgstr "" + +#, python-format +msgid "preserving %s for resolve of %s\n" +msgstr "" + +#, python-format +msgid "update failed to remove %s: %s!\n" +msgstr "" + +#, python-format +msgid "getting %s\n" +msgstr "正在检出 %s\n" + +#, python-format +msgid "moving %s to %s\n" +msgstr "" + +#, python-format +msgid "getting %s to %s\n" +msgstr "" + +#, python-format +msgid "warning: detected divergent renames of %s to:\n" +msgstr "" + +#, python-format +msgid "branch %s not found" +msgstr "" + +msgid "can't merge with ancestor" +msgstr "" + +msgid "nothing to merge (use 'hg update' or check 'hg heads')" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" +msgstr "" + +msgid "crosses branches (use 'hg merge' or 'hg update -C')" +msgstr "" + +msgid "crosses named branches (use 'hg update -C' to discard changes)" +msgstr "" + +#, python-format +msgid "cannot create %s: destination already exists" +msgstr "" + +#, python-format +msgid "cannot create %s: unable to create destination directory" +msgstr "" + +#, python-format +msgid "found patch at byte %d\n" +msgstr "" + +msgid "patch generated by hg export\n" +msgstr "" + +#, python-format +msgid "unable to find '%s' for patching\n" +msgstr "" + +#, python-format +msgid "patching file %s\n" +msgstr "" + +#, python-format +msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d %s (%d %d %d %d)" +msgstr "" + +#, python-format +msgid "file %s already exists\n" +msgstr "" + +#, python-format +msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" +msgstr "" + +#, python-format +msgid "Hunk #%d FAILED at %d\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d" +msgstr "" + +#, python-format +msgid "bad hunk #%d old text line %d" +msgstr "" + +msgid "could not extract binary patch" +msgstr "" + +#, python-format +msgid "binary patch is %d bytes, not %d" +msgstr "" + +#, python-format +msgid "unable to strip away %d dirs from %s" +msgstr "" + +msgid "undefined source and destination files" +msgstr "" + +#, python-format +msgid "malformed patch %s %s" +msgstr "" + +#, python-format +msgid "unsupported parser state: %s" +msgstr "" + +#, python-format +msgid "patch command failed: %s" +msgstr "" + +#, python-format +msgid "no valid hunks found; trying with %r instead\n" +msgstr "" + +#, python-format +msgid "saving bundle to %s\n" +msgstr "" + +msgid "adding branch\n" +msgstr "" + +#, python-format +msgid "cannot %s; remote repository does not support the %r capability" +msgstr "" + +#, python-format +msgid "unknown compression type %r" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for format v0" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for revlogng" +msgstr "" + +#, python-format +msgid "index %s unknown format %d" +msgstr "" + +msgid "no node" +msgstr "" + +msgid "ambiguous identifier" +msgstr "" + +msgid "no match found" +msgstr "" + +#, python-format +msgid "incompatible revision flag %x" +msgstr "" + +#, python-format +msgid "%s not found in the transaction" +msgstr "" + +msgid "unknown base" +msgstr "" + +msgid "consistency error adding group" +msgstr "" + +#, python-format +msgid "%s looks like a binary file." +msgstr "" + +msgid "can only specify two labels." +msgstr "" + +msgid "warning: conflicts during merge.\n" +msgstr "" + +#, python-format +msgid "couldn't parse location %s" +msgstr "" + +msgid "could not create remote repo" +msgstr "" + +msgid "remote: " +msgstr "" + +msgid "no suitable response from remote hg" +msgstr "" + +#, python-format +msgid "push refused: %s" +msgstr "" + +msgid "unsynced changes" +msgstr "" + +msgid "cannot lock static-http repository" +msgstr "" + +msgid "cannot create new static-http repository" +msgstr "" + +#, python-format +msgid "invalid entry in fncache, line %s" +msgstr "" + +msgid "scanning\n" +msgstr "正在扫描\n" + +#, python-format +msgid "%d files, %d bytes to transfer\n" +msgstr "需要传输 %d 个文件，%d 字节\n" + +#, python-format +msgid "sending %s (%d bytes)\n" +msgstr "正在发送 %s (%d 字节)\n" + +msgid "unmatched quotes" +msgstr "不匹配的引号" + +#, python-format +msgid "style not found: %s" +msgstr "没有找到样式: %s" + +#, python-format +msgid "%s:%s: parse error" +msgstr "%s:%s: 解析出错" + +#, python-format +msgid "template file %s: %s" +msgstr "模版文件 %s: %s" + +#, python-format +msgid "Error expanding '%s%%%s'" +msgstr "" + +msgid "transaction abort!\n" +msgstr "事务中止!\n" + +#, python-format +msgid "failed to truncate %s\n" +msgstr "截断 '%s' 失败\n" + +msgid "rollback completed\n" +msgstr "完成回滚\n" + +#, python-format +msgid "Not trusting file %s from untrusted user %s, group %s\n" +msgstr "" + +#, python-format +msgid "" +"Failed to parse %s\n" +"%s" +msgstr "" +"解析 '%s' 失败\n" +"%s" + +#, python-format +msgid "Ignored: %s\n" +msgstr "" + +#, python-format +msgid "unable to open %s: %s" +msgstr "" + +#, python-format +msgid "" +"failed to parse %s\n" +"%s" +msgstr "" + +#, python-format +msgid "" +"Error in configuration section [%s] parameter '%s':\n" +"%s" +msgstr "" + +#, python-format +msgid "Ignoring untrusted configuration option %s.%s = %s\n" +msgstr "" + +#, python-format +msgid "" +"Error in configuration section [%s]:\n" +"%s" +msgstr "" + +msgid "enter a commit username:" +msgstr "" + +#, python-format +msgid "No username found, using '%s' instead\n" +msgstr "" + +msgid "Please specify a username." +msgstr "" + +#, python-format +msgid "username %s contains a newline\n" +msgstr "" + +msgid "unrecognized response\n" +msgstr "" + +msgid "response expected" +msgstr "" + +msgid "password: " +msgstr "密码: " + +msgid "edit failed" +msgstr "" + +msgid "http authorization required" +msgstr "需要 http 授权" + +msgid "http authorization required\n" +msgstr "需要 http 授权\n" + +#, python-format +msgid "realm: %s\n" +msgstr "领域: %s\n" + +#, python-format +msgid "user: %s\n" +msgstr "用户: %s\n" + +msgid "user:" +msgstr "用户:" + +#, python-format +msgid "proxying through http://%s:%s\n" +msgstr "" + +#, python-format +msgid "http auth: user %s, password %s\n" +msgstr "" + +#, python-format +msgid "%s, please check your locale settings" +msgstr "" + +#, python-format +msgid "command '%s' failed: %s" +msgstr "" + +#, python-format +msgid "path contains illegal component: %s" +msgstr "" + +#, python-format +msgid "path %r is inside repo %r" +msgstr "" + +#, python-format +msgid "path %r traverses symbolic link %r" +msgstr "" + +msgid "Hardlinks not supported" +msgstr "" + +msgid "user name not available - set USERNAME environment variable" +msgstr "" + +#, python-format +msgid "exited with status %d" +msgstr "" + +#, python-format +msgid "killed by signal %d" +msgstr "" + +#, python-format +msgid "stopped by signal %d" +msgstr "" + +msgid "invalid exit code" +msgstr "" + +#, python-format +msgid "could not symlink to %r: %s" +msgstr "" + +#, python-format +msgid "invalid date: %r " +msgstr "" + +#, python-format +msgid "date exceeds 32 bits: %d" +msgstr "" + +#, python-format +msgid "impossible time zone offset: %d" +msgstr "" + +#, python-format +msgid "invalid day spec: %s" +msgstr "" + +#, python-format +msgid "%.0f GB" +msgstr "" + +#, python-format +msgid "%.1f GB" +msgstr "" + +#, python-format +msgid "%.2f GB" +msgstr "" + +#, python-format +msgid "%.0f MB" +msgstr "" + +#, python-format +msgid "%.1f MB" +msgstr "" + +#, python-format +msgid "%.2f MB" +msgstr "" + +#, python-format +msgid "%.0f KB" +msgstr "" + +#, python-format +msgid "%.1f KB" +msgstr "" + +#, python-format +msgid "%.2f KB" +msgstr "" + +#, python-format +msgid "%.0f bytes" +msgstr "" + +msgid "cannot verify bundle or remote repos" +msgstr "" + +msgid "interrupted" +msgstr "" + +#, python-format +msgid "empty or missing %s" +msgstr "" + +#, python-format +msgid "data length off by %d bytes" +msgstr "" + +#, python-format +msgid "index contains %d extra bytes" +msgstr "" + +#, python-format +msgid "warning: `%s' uses revlog format 1" +msgstr "" + +#, python-format +msgid "warning: `%s' uses revlog format 0" +msgstr "" + +#, python-format +msgid "rev %d point to %s changeset %d" +msgstr "" + +#, python-format +msgid " (expected %s)" +msgstr "" + +#, python-format +msgid "unknown parent 1 %s of %s" +msgstr "" + +#, python-format +msgid "unknown parent 2 %s of %s" +msgstr "" + +#, python-format +msgid "checking parents of %s" +msgstr "" + +#, python-format +msgid "duplicate revision %d (%d)" +msgstr "" + +#, python-format +msgid "repository uses revlog format %d\n" +msgstr "" + +msgid "checking changesets\n" +msgstr "" + +#, python-format +msgid "unpacking changeset %s" +msgstr "" + +msgid "checking manifests\n" +msgstr "" + +msgid "file without name in manifest" +msgstr "" + +#, python-format +msgid "reading manifest delta %s" +msgstr "" + +msgid "crosschecking files in changesets and manifests\n" +msgstr "" + +#, python-format +msgid "changeset refers to unknown manifest %s" +msgstr "" + +msgid "in changeset but not in manifest" +msgstr "" + +msgid "in manifest but not in changeset" +msgstr "" + +msgid "checking files\n" +msgstr "" + +#, python-format +msgid "cannot decode filename '%s'" +msgstr "" + +msgid "missing revlog!" +msgstr "" + +#, python-format +msgid "%s not in manifests" +msgstr "" + +#, python-format +msgid "unpacked size is %s, %s expected" +msgstr "" + +#, python-format +msgid "unpacking %s" +msgstr "" + +#, python-format +msgid "empty or missing copy source revlog %s:%s" +msgstr "" + +#, python-format +msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgstr "" + +#, python-format +msgid "checking rename of %s" +msgstr "" + +#, python-format +msgid "%s in manifests not found" +msgstr "" + +#, python-format +msgid "warning: orphan revlog '%s'" +msgstr "" + +#, python-format +msgid "%d files, %d changesets, %d total revisions\n" +msgstr "" + +#, python-format +msgid "%d warnings encountered!\n" +msgstr "" + +#, python-format +msgid "%d integrity errors encountered!\n" +msgstr "" + +#, python-format +msgid "(first damaged changeset appears to be %d)\n" +msgstr ""
--- a/mercurial/archival.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/archival.py Fri Feb 27 08:13:42 2009 -0600 @@ -96,6 +96,7 @@ i.mode = 0777 i.linkname = data data = None + i.size = 0 else: i.mode = mode data = cStringIO.StringIO(data)
--- a/mercurial/bdiff.c Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/bdiff.c Fri Feb 27 08:13:42 2009 -0600 @@ -261,6 +261,7 @@ free(pos); + /* normalize the hunk list, try to push each hunk towards the end */ for (curr = l.base; curr != l.head; curr++) { struct hunk *next = curr+1; int shift = 0;
--- a/mercurial/bundlerepo.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/bundlerepo.py Fri Feb 27 08:13:42 2009 -0600 @@ -13,7 +13,7 @@ from node import hex, nullid, short from i18n import _ import changegroup, util, os, struct, bz2, zlib, tempfile, shutil, mdiff -import repo, localrepo, changelog, manifest, filelog, revlog, context +import repo, localrepo, changelog, manifest, filelog, revlog, context, error class bundlerevlog(revlog.revlog): def __init__(self, opener, indexfile, bundlefile, @@ -48,8 +48,8 @@ continue for p in (p1, p2): if not p in self.nodemap: - raise revlog.LookupError(p1, self.indexfile, - _("unknown parent")) + raise error.LookupError(p1, self.indexfile, + _("unknown parent")) if linkmapper is None: link = n else: @@ -119,7 +119,7 @@ p1, p2 = self.parents(node) if node != revlog.hash(text, p1, p2): - raise revlog.RevlogError(_("integrity check failed on %s:%d") + raise error.RevlogError(_("integrity check failed on %s:%d") % (self.datafile, self.rev(node))) self._cache = (node, self.rev(node), text) @@ -156,7 +156,7 @@ self._tempparent = None try: localrepo.localrepository.__init__(self, ui, path) - except repo.RepoError: + except error.RepoError: self._tempparent = tempfile.mkdtemp() tmprepo = localrepo.instance(ui,self._tempparent,1) localrepo.localrepository.__init__(self, ui, self._tempparent)
--- a/mercurial/changelog.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/changelog.py Fri Feb 27 08:13:42 2009 -0600 @@ -6,9 +6,8 @@ # of the GNU General Public License, incorporated herein by reference. from node import bin, hex, nullid -from revlog import revlog, RevlogError from i18n import _ -import util +import util, error, revlog def _string_escape(text): """ @@ -75,9 +74,9 @@ self.data.append(str(s)) self.offset += len(s) -class changelog(revlog): +class changelog(revlog.revlog): def __init__(self, opener): - revlog.__init__(self, opener, "00changelog.i") + revlog.revlog.__init__(self, opener, "00changelog.i") def delayupdate(self): "delay visibility of index updates to other readers" @@ -97,7 +96,7 @@ fp = self.opener(self.indexfile, 'a') fp.write("".join(self._delaybuf)) fp.close() - del self._delaybuf + self._delaybuf = [] # split when we're done self.checkinlinesize(tr) @@ -116,10 +115,35 @@ # otherwise, divert to memory return appender(fp, self._delaybuf) + def readpending(self, file): + r = revlog.revlog(self.opener, file) + self.index = r.index + self.nodemap = r.nodemap + self._chunkcache = r._chunkcache + + def writepending(self): + "create a file containing the unfinalized state for pretxnchangegroup" + if self._delaybuf: + # make a temporary copy of the index + fp1 = self._realopener(self.indexfile) + fp2 = self._realopener(self.indexfile + ".a", "w") + fp2.write(fp1.read()) + # add pending data + fp2.write("".join(self._delaybuf)) + fp2.close() + # switch modes so finalize can simply rename + self._delaybuf = [] + self._delayname = fp1.name + + if self._delayname: + return True + + return False + def checkinlinesize(self, tr, fp=None): if self.opener == self._delayopener: return - return revlog.checkinlinesize(self, tr, fp) + return revlog.revlog.checkinlinesize(self, tr, fp) def decode_extra(self, text): extra = {} @@ -179,7 +203,8 @@ user = user.strip() if "\n" in user: - raise RevlogError(_("username %s contains a newline") % `user`) + raise error.RevlogError(_("username %s contains a newline") + % repr(user)) user, desc = util.fromlocal(user), util.fromlocal(desc) if date:
--- a/mercurial/cmdutil.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/cmdutil.py Fri Feb 27 08:13:42 2009 -0600 @@ -8,16 +8,11 @@ from node import hex, nullid, nullrev, short from i18n import _ import os, sys, bisect, stat -import mdiff, bdiff, util, templater, templatefilters, patch, errno +import mdiff, bdiff, util, templater, templatefilters, patch, errno, error import match as _match revrangesep = ':' -class UnknownCommand(Exception): - """Exception raised if command is not in the command table.""" -class AmbiguousCommand(Exception): - """Exception raised if command shortcut matches more than one command.""" - def findpossible(cmd, table, strict=False): """ Return cmd -> (aliases, command table entry) @@ -57,12 +52,12 @@ if len(choice) > 1: clist = choice.keys() clist.sort() - raise AmbiguousCommand(cmd, clist) + raise error.AmbiguousCommand(cmd, clist) if choice: return choice.values()[0] - raise UnknownCommand(cmd) + raise error.UnknownCommand(cmd) def bail_if_changed(repo): if repo.dirstate.parents()[1] != nullid: @@ -73,8 +68,8 @@ def logmessage(opts): """ get the log message according to -m and -l option """ - message = opts['message'] - logfile = opts['logfile'] + message = opts.get('message') + logfile = opts.get('logfile') if message and logfile: raise util.Abort(_('options --message and --logfile are mutually ' @@ -574,11 +569,12 @@ class changeset_printer(object): '''show changeset information when templating not requested.''' - def __init__(self, ui, repo, patch, buffered): + def __init__(self, ui, repo, patch, diffopts, buffered): self.ui = ui self.repo = repo self.buffered = buffered self.patch = patch + self.diffopts = diffopts self.header = {} self.hunk = {} self.lastheader = None @@ -675,7 +671,7 @@ if self.patch: prev = self.repo.changelog.parents(node)[0] chunks = patch.diff(self.repo, prev, node, match=self.patch, - opts=patch.diffopts(self.ui)) + opts=patch.diffopts(self.ui, self.diffopts)) for chunk in chunks: self.ui.write(chunk) self.ui.write("\n") @@ -699,8 +695,8 @@ class changeset_templater(changeset_printer): '''format changeset information.''' - def __init__(self, ui, repo, patch, mapfile, buffered): - changeset_printer.__init__(self, ui, repo, patch, buffered) + def __init__(self, ui, repo, patch, diffopts, mapfile, buffered): + changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) filters = templatefilters.filters.copy() filters['formatnode'] = (ui.debugflag and (lambda x: x) or (lambda x: x[:12])) @@ -917,12 +913,12 @@ or templater.templatepath(mapfile)) if mapname: mapfile = mapname try: - t = changeset_templater(ui, repo, patch, mapfile, buffered) + t = changeset_templater(ui, repo, patch, opts, mapfile, buffered) except SyntaxError, inst: raise util.Abort(inst.args[0]) if tmpl: t.use_template(tmpl) return t - return changeset_printer(ui, repo, patch, buffered) + return changeset_printer(ui, repo, patch, opts, buffered) def finddate(ui, repo, date): """Find the tipmost changeset that matches the given date spec""" @@ -994,7 +990,7 @@ defrange = '-1:0' revs = revrange(repo, opts['rev'] or [defrange]) wanted = {} - slowpath = m.anypats() or opts.get('removed') + slowpath = m.anypats() or (m.files() and opts.get('removed')) fncache = {} if not slowpath and not m.files():
--- a/mercurial/commands.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/commands.py Fri Feb 27 08:13:42 2009 -0600 @@ -6,12 +6,10 @@ # of the GNU General Public License, incorporated herein by reference. from node import hex, nullid, nullrev, short -from repo import RepoError, NoCapability from i18n import _, gettext import os, re, sys -import hg, util, revlog, bundlerepo, extensions, copies, context +import hg, util, revlog, bundlerepo, extensions, copies, context, error import difflib, patch, time, help, mdiff, tempfile, url -import version import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect import merge as merge_ @@ -328,29 +326,34 @@ state = hbisect.load_state(repo) if command: + commandpath = util.find_exe(command) changesets = 1 - while changesets: - # update state - status = os.spawnlp(os.P_WAIT, command) - node = repo.lookup(rev or '.') - if status == 125: - transition = "skip" - elif status == 0: - transition = "good" - # status < 0 means process was killed - elif status == 127 or status < 0: - break - else: - transition = "bad" - state[transition].append(node) - ui.note(_('Changeset %s: %s\n') % (short(node), transition)) - check_state(state, interactive=False) - # bisect - nodes, changesets, good = hbisect.bisect(repo.changelog, state) - # update to next check - cmdutil.bail_if_changed(repo) - hg.clean(repo, nodes[0], show_stats=False) - hbisect.save_state(repo, state) + try: + while changesets: + # update state + status = os.spawnl(os.P_WAIT, commandpath) + if status == 125: + transition = "skip" + elif status == 0: + transition = "good" + # status < 0 means process was killed + elif status == 127: + raise util.Abort(_("failed to execute %s") % command) + elif status < 0: + raise util.Abort(_("%s killed") % command) + else: + transition = "bad" + node = repo.lookup(rev or '.') + state[transition].append(node) + ui.note(_('Changeset %s: %s\n') % (short(node), transition)) + check_state(state, interactive=False) + # bisect + nodes, changesets, good = hbisect.bisect(repo.changelog, state) + # update to next check + cmdutil.bail_if_changed(repo) + hg.clean(repo, nodes[0], show_stats=False) + finally: + hbisect.save_state(repo, state) return print_result(nodes, not status) # update state @@ -428,7 +431,7 @@ """ hexfunc = ui.debugflag and hex or short activebranches = [util.tolocal(repo[n].branch()) - for n in repo.heads()] + for n in repo.heads(closed=False)] branches = util.sort([(tag in activebranches, repo.changelog.rev(node), tag) for tag, node in repo.branchtags().items()]) branches.reverse() @@ -438,9 +441,15 @@ if ui.quiet: ui.write("%s\n" % tag) else: - rev = str(node).rjust(31 - util.locallen(tag)) - isinactive = ((not isactive) and " (inactive)") or '' - data = tag, rev, hexfunc(repo.lookup(node)), isinactive + hn = repo.lookup(node) + if isactive: + notice = '' + elif hn not in repo.branchheads(tag, closed=False): + notice = ' (closed)' + else: + notice = ' (inactive)' + rev = str(node).rjust(31 - util.colwidth(tag)) + data = tag, rev, hexfunc(hn), notice ui.write("%s %s:%s%s\n" % data) def bundle(ui, repo, fname, dest=None, **opts): @@ -580,12 +589,11 @@ If the -U option is used, the new clone will contain only a repository (.hg) and no working copy (the working copy parent is the null revision). - See pull for valid source format details. + See 'hg help urls' for valid source format details. It is possible to specify an ssh:// URL as the destination, but no .hg/hgrc and working directory will be created on the remote side. - Look at the help text for the pull command for important details - about ssh:// URLs. + Look at the help text for urls for important details about ssh:// URLs. """ cmdutil.setremoteconfig(ui, opts) hg.clone(ui, source, dest, @@ -610,9 +618,13 @@ See 'hg help dates' for a list of formats valid for -d/--date. """ + extra = {} + if opts.get('close_branch'): + extra['close'] = 1 def commitfunc(ui, repo, message, match, opts): - return repo.commit(match.files(), message, opts.get('user'), opts.get('date'), - match, force_editor=opts.get('force_editor')) + return repo.commit(match.files(), message, opts.get('user'), + opts.get('date'), match, force_editor=opts.get('force_editor'), + extra=extra) node = cmdutil.commit(ui, repo, commitfunc, pats, opts) if not node: @@ -633,6 +645,9 @@ elif ui.verbose: ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) + ms = merge_.mergestate(repo) + ms.reset(node) + def copy(ui, repo, *pats, **opts): """mark files as copied for the next commit @@ -688,7 +703,10 @@ ui.write("%s\n" % "\n".join(options)) return - ui.write("%s\n" % "\n".join(util.sort(cmdutil.findpossible(cmd, table)))) + cmdlist = cmdutil.findpossible(cmd, table) + if ui.verbose: + cmdlist = [' '.join(c[0]) for c in cmdlist.values()] + ui.write("%s\n" % "\n".join(util.sort(cmdlist))) def debugfsinfo(ui, path = "."): file('.debugfsinfo', 'w').write('') @@ -780,7 +798,7 @@ """show the contents of the current dirstate""" timestr = "" showdate = not nodates - for file_, ent in util.sort(repo.dirstate._map.items()): + for file_, ent in util.sort(repo.dirstate._map.iteritems()): if showdate: if ent[3] == -1: # Pad or slice to locale representation @@ -820,7 +838,7 @@ def debugindex(ui, file_): """dump the contents of an index file""" r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) - ui.write(" rev offset length base linkrev" + + ui.write(" rev offset length base linkrev" " nodeid p1 p2\n") for i in r: node = r.node(i) @@ -1007,7 +1025,18 @@ Use the --git option to generate diffs in the git extended diff format. Read the diffs help topic for more information. """ - node1, node2 = cmdutil.revpair(repo, opts.get('rev')) + + revs = opts.get('rev') + change = opts.get('change') + + if revs and change: + msg = _('cannot specify --rev and --change at the same time') + raise util.Abort(msg) + elif change: + node2 = repo.lookup(change) + node1 = repo[node2].parents()[0].node() + else: + node1, node2 = cmdutil.revpair(repo, revs) m = cmdutil.match(repo, pats, opts) it = patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts)) @@ -1196,7 +1225,7 @@ copied = getfile(fn).renamed(ctx.filenode(fn)) if copied: copies.setdefault(rev, {})[fn] = copied[0] - except revlog.LookupError: + except error.LookupError: pass elif st == 'iter': for fn, m in util.sort(matches[rev].items()): @@ -1245,9 +1274,10 @@ start = repo.lookup(opts['rev']) else: start = None + closed = not opts.get('active') if not branchrevs: # Assume we're looking repo-wide heads if no revs were specified. - heads = repo.heads(start) + heads = repo.heads(start, closed=closed) else: heads = [] visitedset = util.set() @@ -1256,7 +1286,7 @@ if branch in visitedset: continue visitedset.add(branch) - bheads = repo.branchheads(branch, start) + bheads = repo.branchheads(branch, start, closed=closed) if not bheads: if branch != branchrev: ui.warn(_("no changes on branch %s containing %s are " @@ -1304,7 +1334,7 @@ try: aliases, i = cmdutil.findcmd(name, table, False) - except cmdutil.AmbiguousCommand, inst: + except error.AmbiguousCommand, inst: select = lambda c: c.lstrip('^').startswith(inst.args[0]) helplist(_('list of commands:\n\n'), select) return @@ -1325,7 +1355,7 @@ # description doc = gettext(i[0].__doc__) if not doc: - doc = _("(No help text available)") + doc = _("(no help text available)") if ui.quiet: doc = doc.splitlines(0)[0] ui.write("\n%s\n" % doc.rstrip()) @@ -1340,7 +1370,7 @@ def helplist(header, select=None): h = {} cmds = {} - for c, e in table.items(): + for c, e in table.iteritems(): f = c.split("|", 1)[0] if select and not select(f): continue @@ -1354,7 +1384,7 @@ continue doc = gettext(e[0].__doc__) if not doc: - doc = _("(No help text available)") + doc = _("(no help text available)") h[f] = doc.splitlines(0)[0].rstrip() cmds[f] = c.lstrip("^") @@ -1393,11 +1423,11 @@ if name in names: break else: - raise cmdutil.UnknownCommand(name) + raise error.UnknownCommand(name) # description if not doc: - doc = _("(No help text available)") + doc = _("(no help text available)") if callable(doc): doc = doc() @@ -1408,9 +1438,9 @@ try: mod = extensions.find(name) except KeyError: - raise cmdutil.UnknownCommand(name) - - doc = gettext(mod.__doc__) or _('No help text available') + raise error.UnknownCommand(name) + + doc = gettext(mod.__doc__) or _('no help text available') doc = doc.splitlines(0) ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) for d in doc[1:]: @@ -1433,7 +1463,7 @@ f(name) i = None break - except cmdutil.UnknownCommand, inst: + except error.UnknownCommand, inst: i = inst if i: raise i @@ -1508,9 +1538,12 @@ default = not (num or id or branch or tags) output = [] + revs = [] if source: source, revs, checkout = hg.parseurl(ui.expandpath(source), []) - srepo = hg.repository(ui, source) + repo = hg.repository(ui, source) + + if not repo.local(): if not rev and revs: rev = revs[0] if not rev: @@ -1518,7 +1551,7 @@ if num or branch or tags: raise util.Abort( "can't query remote revision number, branch, or tags") - output = [hexfunc(srepo.lookup(rev))] + output = [hexfunc(repo.lookup(rev))] elif not rev: ctx = repo[None] parents = ctx.parents() @@ -1538,7 +1571,7 @@ if num: output.append(str(ctx.rev())) - if not source and default and not ui.quiet: + if repo.local() and default and not ui.quiet: b = util.tolocal(ctx.branch()) if b != 'default': output.append("(%s)" % b) @@ -1653,7 +1686,7 @@ p2 = repo.lookup(p2) if p1 == wp[0].node(): repo.dirstate.setparents(p1, p2) - except RepoError: + except error.RepoError: pass if opts.get('exact') or opts.get('import_branch'): repo.dirstate.setbranch(branch or 'default') @@ -1760,8 +1793,7 @@ If no directory is given, the current directory is used. It is possible to specify an ssh:// URL as the destination. - Look at the help text for the pull command for important details - about ssh:// URLs. + See 'hg help urls' for more information. """ cmdutil.setremoteconfig(ui, opts) hg.repository(ui, dest, create=1) @@ -1794,7 +1826,7 @@ if not rev and abs not in repo.dirstate: continue if opts.get('fullpath'): - ui.write(os.path.join(repo.root, abs), end) + ui.write(repo.wjoin(abs), end) else: ui.write(((pats and m.rel(abs)) or abs), end) ret = 0 @@ -1869,7 +1901,7 @@ try: return repo[rev][fn].renamed() - except revlog.LookupError: + except error.LookupError: pass return None @@ -2068,7 +2100,7 @@ continue try: filenodes.append(cp.filenode(file_)) - except revlog.LookupError: + except error.LookupError: pass if not filenodes: raise util.Abort(_("'%s' not found in manifest!") % file_) @@ -2083,13 +2115,15 @@ displayer.show(repo[n]) def paths(ui, repo, search=None): - """show definition of symbolic path names + """show aliases for remote repositories Show definition of symbolic path name NAME. If no name is given, show definition of available names. Path names are defined in the [paths] section of /etc/mercurial/hgrc and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. + + See 'hg help urls' for more information. """ if search: for name, path in ui.configitems("paths"): @@ -2124,34 +2158,8 @@ or URL and adds them to the local repository. By default, this does not update the copy of the project in the working directory. - Valid URLs are of the form: - - local/filesystem/path (or file://local/filesystem/path) - http://[user[:pass]@]host[:port]/[path] - https://[user[:pass]@]host[:port]/[path] - ssh://[user[:pass]@]host[:port]/[path] - - Paths in the local filesystem can either point to Mercurial - repositories or to bundle files (as created by 'hg bundle' or - 'hg incoming --bundle'). - - An optional identifier after # indicates a particular branch, tag, - or changeset to pull. - - Some notes about using SSH with Mercurial: - - SSH requires an accessible shell account on the destination machine - and a copy of hg in the remote path or specified with as remotecmd. - - path is relative to the remote user's home directory by default. - Use an extra slash at the start of a path to specify an absolute path: - ssh://example.com//tmp/repository - - Mercurial doesn't use its own compression via SSH; the right thing - to do is to configure it in your ~/.ssh/config, e.g.: - Host *.mylocalnetwork.example.com - Compression no - Host * - Compression yes - Alternatively specify "ssh -C" as your ssh command in your hgrc or - with the --ssh command line option. + If SOURCE is omitted, the 'default' path will be used. + See 'hg help urls' for more information. """ source, revs, checkout = hg.parseurl(ui.expandpath(source), opts.get('rev')) cmdutil.setremoteconfig(ui, opts) @@ -2161,10 +2169,10 @@ if revs: try: revs = [other.lookup(rev) for rev in revs] - except NoCapability: - error = _("Other repository doesn't support revision lookup, " - "so a rev cannot be specified.") - raise util.Abort(error) + except error.CapabilityError: + err = _("Other repository doesn't support revision lookup, " + "so a rev cannot be specified.") + raise util.Abort(err) modheads = repo.pull(other, heads=revs, force=opts.get('force')) return postincoming(ui, repo, modheads, opts.get('update'), checkout) @@ -2183,22 +2191,12 @@ increase the number of remote heads. This generally indicates the the client has forgotten to pull and merge before pushing. - Valid URLs are of the form: - - local/filesystem/path (or file://local/filesystem/path) - ssh://[user[:pass]@]host[:port]/[path] - http://[user[:pass]@]host[:port]/[path] - https://[user[:pass]@]host[:port]/[path] - - An optional identifier after # indicates a particular branch, tag, - or changeset to push. If -r is used, the named changeset and all its - ancestors will be pushed to the remote repository. - - Look at the help text for the pull command for important details - about ssh:// URLs. - - Pushing to http:// and https:// URLs is only possible, if this - feature is explicitly enabled on the remote Mercurial server. + If -r is used, the named changeset and all its ancestors will be pushed + to the remote repository. + + Look at the help text for urls for important details about ssh:// URLs. + If DESTINATION is omitted, a default path will be used. + See 'hg help urls' for more information. """ dest, revs, checkout = hg.parseurl( ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev')) @@ -2631,7 +2629,7 @@ if opts["stdio"]: if repo is None: - raise RepoError(_("There is no Mercurial repository here" + raise error.RepoError(_("There is no Mercurial repository here" " (.hg not found)")) s = sshserver.sshserver(ui, repo) s.serve_forever() @@ -2646,8 +2644,8 @@ repo.ui.setconfig("web", o, str(opts[o])) if repo is None and not ui.config("web", "webdir_conf"): - raise RepoError(_("There is no Mercurial repository here" - " (.hg not found)")) + raise error.RepoError(_("There is no Mercurial repository here" + " (.hg not found)")) class service: def init(self): @@ -2720,7 +2718,7 @@ end = opts.get('print0') and '\0' or '\n' copy = {} states = 'modified added removed deleted unknown ignored clean'.split() - show = [k for k in states if opts[k]] + show = [k for k in states if opts.get(k)] if opts.get('all'): show += ui.quiet and (states[:4] + ['clean']) or states if not show: @@ -2738,7 +2736,7 @@ if node2 is None: added = stat[0] + stat[1] # merged? - for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items(): + for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems(): if k in added: copy[k] = v elif v in added: @@ -2822,8 +2820,6 @@ def tags(ui, repo): """list repository tags - List the repository tags. - This lists both regular and local tags. When the -v/--verbose switch is used, a third column "local" is printed for local tags. """ @@ -2841,10 +2837,10 @@ try: hn = hexfunc(n) r = "%5d:%s" % (repo.changelog.rev(n), hn) - except revlog.LookupError: + except error.LookupError: r = " ?:%s" % hn else: - spaces = " " * (30 - util.locallen(t)) + spaces = " " * (30 - util.colwidth(t)) if ui.verbose: if repo.tagtype(t) == 'local': tagtype = " local" @@ -2944,7 +2940,7 @@ def version_(ui): """output version and copyright information""" ui.write(_("Mercurial Distributed SCM (version %s)\n") - % version.get_version()) + % util.version()) ui.status(_( "\nCopyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n" "This is free software; see the source for copying conditions. " @@ -3005,6 +3001,7 @@ logopts = [ ('p', 'patch', None, _('show patch')), + ('g', 'git', None, _('use git extended diff format')), ('l', 'limit', '', _('limit number of changes displayed')), ('M', 'no-merges', None, _('do not show merges')), ] + templateopts @@ -3071,7 +3068,7 @@ ('g', 'good', False, _('mark changeset good')), ('b', 'bad', False, _('mark changeset bad')), ('s', 'skip', False, _('skip testing changeset')), - ('c', 'command', '', _('Use command to check changeset state')), + ('c', 'command', '', _('use command to check changeset state')), ('U', 'noupdate', False, _('do not update to target'))], _("[-gbsr] [-c CMD] [REV]")), "branch": @@ -3119,6 +3116,8 @@ (commit, [('A', 'addremove', None, _('mark new/missing files as added/removed before committing')), + ('', 'close-branch', None, + _('mark a branch as closed, hiding it from the branch list')), ] + walkopts + commitopts + commitopts2, _('[OPTION]... [FILE]...')), "copy|cp": @@ -3166,7 +3165,8 @@ "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')), "^diff": (diff, - [('r', 'rev', [], _('revision')) + [('r', 'rev', [], _('revision')), + ('c', 'change', '', _('change made by revision')) ] + diffopts + diffopts2 + walkopts, _('[OPTION]... [-r REV1 [-r REV2]] [FILE]...')), "^export": @@ -3193,6 +3193,8 @@ "heads": (heads, [('r', 'rev', '', _('show only heads which are descendants of rev')), + ('a', 'active', False, + _('show only the active heads from open branches')), ] + templateopts, _('[-r REV] [REV]...')), "help": (help_, [], _('[TOPIC]')), @@ -3323,7 +3325,8 @@ [('a', 'all', None, _('remerge all unresolved files')), ('l', 'list', None, _('list state of files needing merge')), ('m', 'mark', None, _('mark files as resolved')), - ('u', 'unmark', None, _('unmark files as resolved'))], + ('u', 'unmark', None, _('unmark files as resolved'))] + + walkopts, _('[OPTION]... [FILE]...')), "revert": (revert, @@ -3390,6 +3393,7 @@ "tip": (tip, [('p', 'patch', None, _('show patch')), + ('g', 'git', None, _('use git extended diff format')), ] + templateopts, _('[-p]')), "unbundle":
--- a/mercurial/context.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/context.py Fri Feb 27 08:13:42 2009 -0600 @@ -7,7 +7,7 @@ from node import nullid, nullrev, short, hex from i18n import _ -import ancestor, bdiff, revlog, util, os, errno +import ancestor, bdiff, error, util, os, errno class propertycache(object): def __init__(self, func): @@ -125,15 +125,15 @@ try: return self._manifest[path], self._manifest.flags(path) except KeyError: - raise revlog.LookupError(self._node, path, - _('not found in manifest')) + raise error.LookupError(self._node, path, + _('not found in manifest')) if '_manifestdelta' in self.__dict__ or path in self.files(): if path in self._manifestdelta: return self._manifestdelta[path], self._manifestdelta.flags(path) node, flag = self._repo.manifest.find(self._changeset[0], path) if not node: - raise revlog.LookupError(self._node, path, - _('not found in manifest')) + raise error.LookupError(self._node, path, + _('not found in manifest')) return node, flag @@ -143,7 +143,7 @@ def flags(self, path): try: return self._fileinfo(path)[1] - except revlog.LookupError: + except error.LookupError: return '' def filectx(self, path, fileid=None, filelog=None): @@ -235,7 +235,7 @@ try: n = self._filenode return True - except revlog.LookupError: + except error.LookupError: # file is missing return False @@ -316,7 +316,7 @@ try: if fnode == p.filenode(name): return None - except revlog.LookupError: + except error.LookupError: pass return renamed
--- a/mercurial/copies.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/copies.py Fri Feb 27 08:13:42 2009 -0600 @@ -189,7 +189,7 @@ # examine each file copy for a potential directory move, which is # when all the files in a directory are moved to a new directory - for dst, src in fullcopy.items(): + for dst, src in fullcopy.iteritems(): dsrc, ddst = _dirname(src), _dirname(dst) if dsrc in invalid: # already seen to be uninteresting
--- a/mercurial/demandimport.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/demandimport.py Fri Feb 27 08:13:42 2009 -0600 @@ -24,6 +24,7 @@ b = __import__(a) ''' +import __builtin__ _origimport = __import__ class _demandmod(object): @@ -126,9 +127,9 @@ def enable(): "enable global demand-loading of modules" - __builtins__["__import__"] = _demandimport + __builtin__.__import__ = _demandimport def disable(): "disable global demand-loading of modules" - __builtins__["__import__"] = _origimport + __builtin__.__import__ = _origimport
--- a/mercurial/dispatch.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/dispatch.py Fri Feb 27 08:13:42 2009 -0600 @@ -6,15 +6,11 @@ # of the GNU General Public License, incorporated herein by reference. from i18n import _ -from repo import RepoError import os, sys, atexit, signal, pdb, socket, errno, shlex, time -import util, commands, hg, lock, fancyopts, revlog, version, extensions, hook +import util, commands, hg, lock, fancyopts, extensions, hook, error import cmdutil import ui as _ui -class ParseError(Exception): - """Exception raised on errors in parsing the command line.""" - def run(): "run the command in sys.argv" sys.exit(dispatch(sys.argv[1:])) @@ -30,7 +26,7 @@ def _runcatch(ui, args): def catchterm(*args): - raise util.SignalInterrupt + raise error.SignalInterrupt for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': num = getattr(signal, name, None) @@ -52,45 +48,53 @@ ui.print_exc() raise - except ParseError, inst: + # Global exception handling, alphabetically + # Mercurial-specific first, followed by built-in and library exceptions + except error.AmbiguousCommand, inst: + ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % + (inst.args[0], " ".join(inst.args[1]))) + except error.LockHeld, inst: + if inst.errno == errno.ETIMEDOUT: + reason = _('timed out waiting for lock held by %s') % inst.locker + else: + reason = _('lock held by %s') % inst.locker + ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) + except error.LockUnavailable, inst: + ui.warn(_("abort: could not lock %s: %s\n") % + (inst.desc or inst.filename, inst.strerror)) + except error.ParseError, inst: if inst.args[0]: ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) commands.help_(ui, inst.args[0]) else: ui.warn(_("hg: %s\n") % inst.args[1]) commands.help_(ui, 'shortlist') - except cmdutil.AmbiguousCommand, inst: - ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % - (inst.args[0], " ".join(inst.args[1]))) - except cmdutil.UnknownCommand, inst: + except error.RepoError, inst: + ui.warn(_("abort: %s!\n") % inst) + except error.ResponseError, inst: + ui.warn(_("abort: %s") % inst.args[0]) + if not isinstance(inst.args[1], basestring): + ui.warn(" %r\n" % (inst.args[1],)) + elif not inst.args[1]: + ui.warn(_(" empty string\n")) + else: + ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) + except error.RevlogError, inst: + ui.warn(_("abort: %s!\n") % inst) + except error.SignalInterrupt: + ui.warn(_("killed!\n")) + except error.UnknownCommand, inst: ui.warn(_("hg: unknown command '%s'\n") % inst.args[0]) commands.help_(ui, 'shortlist') - except RepoError, inst: - ui.warn(_("abort: %s!\n") % inst) - except lock.LockHeld, inst: - if inst.errno == errno.ETIMEDOUT: - reason = _('timed out waiting for lock held by %s') % inst.locker - else: - reason = _('lock held by %s') % inst.locker - ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) - except lock.LockUnavailable, inst: - ui.warn(_("abort: could not lock %s: %s\n") % - (inst.desc or inst.filename, inst.strerror)) - except revlog.RevlogError, inst: - ui.warn(_("abort: %s!\n") % inst) - except util.SignalInterrupt: - ui.warn(_("killed!\n")) - except KeyboardInterrupt: - try: - ui.warn(_("interrupted!\n")) - except IOError, inst: - if inst.errno == errno.EPIPE: - if ui.debugflag: - ui.warn(_("\nbroken pipe\n")) - else: - raise - except socket.error, inst: - ui.warn(_("abort: %s\n") % inst[-1]) + except util.Abort, inst: + ui.warn(_("abort: %s\n") % inst) + except ImportError, inst: + m = str(inst).split()[-1] + ui.warn(_("abort: could not import module %s!\n") % m) + if m in "mpatch bdiff".split(): + ui.warn(_("(did you forget to compile extensions?)\n")) + elif m in "zlib".split(): + ui.warn(_("(is your Python install correct?)\n")) except IOError, inst: if hasattr(inst, "code"): ui.warn(_("abort: %s\n") % inst) @@ -100,7 +104,7 @@ except: # it might be anything, for example a string reason = inst.reason ui.warn(_("abort: error: %s\n") % reason) - elif hasattr(inst, "args") and inst[0] == errno.EPIPE: + elif hasattr(inst, "args") and inst.args[0] == errno.EPIPE: if ui.debugflag: ui.warn(_("broken pipe\n")) elif getattr(inst, "strerror", None): @@ -115,37 +119,30 @@ ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) else: ui.warn(_("abort: %s\n") % inst.strerror) - except util.UnexpectedOutput, inst: - ui.warn(_("abort: %s") % inst[0]) - if not isinstance(inst[1], basestring): - ui.warn(" %r\n" % (inst[1],)) - elif not inst[1]: - ui.warn(_(" empty string\n")) - else: - ui.warn("\n%r\n" % util.ellipsis(inst[1])) - except ImportError, inst: - m = str(inst).split()[-1] - ui.warn(_("abort: could not import module %s!\n") % m) - if m in "mpatch bdiff".split(): - ui.warn(_("(did you forget to compile extensions?)\n")) - elif m in "zlib".split(): - ui.warn(_("(is your Python install correct?)\n")) - - except util.Abort, inst: - ui.warn(_("abort: %s\n") % inst) + except KeyboardInterrupt: + try: + ui.warn(_("interrupted!\n")) + except IOError, inst: + if inst.errno == errno.EPIPE: + if ui.debugflag: + ui.warn(_("\nbroken pipe\n")) + else: + raise except MemoryError: ui.warn(_("abort: out of memory\n")) except SystemExit, inst: # Commands shouldn't sys.exit directly, but give a return code. # Just in case catch this and and pass exit code to caller. return inst.code + except socket.error, inst: + ui.warn(_("abort: %s\n") % inst.args[-1]) except: ui.warn(_("** unknown exception encountered, details follow\n")) ui.warn(_("** report bug details to " "http://www.selenic.com/mercurial/bts\n")) ui.warn(_("** or mercurial@selenic.com\n")) ui.warn(_("** Mercurial Distributed SCM (version %s)\n") - % version.get_version()) + % util.version()) ui.warn(_("** Extensions loaded: %s\n") % ", ".join([x[0] for x in extensions.extensions()])) raise @@ -167,7 +164,7 @@ try: args = fancyopts.fancyopts(args, commands.globalopts, options) except fancyopts.getopt.GetoptError, inst: - raise ParseError(None, inst) + raise error.ParseError(None, inst) if args: cmd, args = args[0], args[1:] @@ -187,9 +184,9 @@ c.append((o[0], o[1], options[o[1]], o[3])) try: - args = fancyopts.fancyopts(args, c, cmdoptions) + args = fancyopts.fancyopts(args, c, cmdoptions, True) except fancyopts.getopt.GetoptError, inst: - raise ParseError(cmd, inst) + raise error.ParseError(cmd, inst) # separate global options back out for o in commands.globalopts: @@ -345,7 +342,7 @@ if not repo.local(): raise util.Abort(_("repository '%s' is not local") % path) ui.setconfig("bundle", "mainreporoot", repo.root) - except RepoError: + except error.RepoError: if cmd not in commands.optionalrepo.split(): if args and not path: # try to infer -R from command args repos = map(_findrepo, args) @@ -353,10 +350,12 @@ if guess and repos.count(guess) == len(repos): return _dispatch(ui, ['--repository', guess] + fullargs) if not path: - raise RepoError(_("There is no Mercurial repository here" - " (.hg not found)")) + raise error.RepoError(_("There is no Mercurial repository" + " here (.hg not found)")) raise args.insert(0, repo) + elif rpath: + ui.warn("warning: --repository ignored\n") d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) @@ -374,8 +373,8 @@ def checkargs(): try: return cmdfunc() - except util.SignatureError: - raise ParseError(cmd, _("invalid arguments")) + except error.SignatureError: + raise error.ParseError(cmd, _("invalid arguments")) if options['profile']: import hotshot, hotshot.stats
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/error.py Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,64 @@ +""" +error.py - Mercurial exceptions + +This allows us to catch exceptions at higher levels without forcing imports + +Copyright 2005-2008 Matt Mackall <mpm@selenic.com> + +This software may be used and distributed according to the terms +of the GNU General Public License, incorporated herein by reference. +""" + +# Do not import anything here, please + +class RevlogError(Exception): + pass + +class LookupError(RevlogError, KeyError): + def __init__(self, name, index, message): + self.name = name + if isinstance(name, str) and len(name) == 20: + from node import short + name = short(name) + RevlogError.__init__(self, '%s@%s: %s' % (index, name, message)) + + def __str__(self): + return RevlogError.__str__(self) + +class ParseError(Exception): + """Exception raised on errors in parsing the command line.""" + +class RepoError(Exception): + pass + +class CapabilityError(RepoError): + pass + +class LockError(IOError): + def __init__(self, errno, strerror, filename, desc): + IOError.__init__(self, errno, strerror, filename) + self.desc = desc + +class LockHeld(LockError): + def __init__(self, errno, filename, desc, locker): + LockError.__init__(self, errno, 'Lock held', filename, desc) + self.locker = locker + +class LockUnavailable(LockError): + pass + +class ResponseError(Exception): + """Raised to print an error with part of output and exit.""" + +class UnknownCommand(Exception): + """Exception raised if command is not in the command table.""" + +class AmbiguousCommand(Exception): + """Exception raised if command shortcut matches more than one command.""" + +# derived from KeyboardInterrupt to simplify some breakout code +class SignalInterrupt(KeyboardInterrupt): + """Exception raised on SIGTERM and SIGHUP.""" + +class SignatureError(Exception): + pass
--- a/mercurial/extensions.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/extensions.py Fri Feb 27 08:13:42 2009 -0600 @@ -75,7 +75,7 @@ path = os.path.expanduser(path) try: load(ui, name, path) - except (util.SignalInterrupt, KeyboardInterrupt): + except KeyboardInterrupt: raise except Exception, inst: if path:
--- a/mercurial/fancyopts.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/fancyopts.py Fri Feb 27 08:13:42 2009 -0600 @@ -1,6 +1,32 @@ import getopt -def fancyopts(args, options, state): +def gnugetopt(args, options, longoptions): + """Parse options mostly like getopt.gnu_getopt. + + This is different from getopt.gnu_getopt in that an argument of - will + become an argument of - instead of vanishing completely. + """ + extraargs = [] + if '--' in args: + stopindex = args.index('--') + extraargs = args[stopindex+1:] + args = args[:stopindex] + opts, parseargs = getopt.getopt(args, options, longoptions) + args = [] + while parseargs: + arg = parseargs.pop(0) + if arg and arg[0] == '-' and len(arg) > 1: + parseargs.insert(0, arg) + topts, newparseargs = getopt.getopt(parseargs, options, longoptions) + opts = opts + topts + parseargs = newparseargs + else: + args.append(arg) + args.extend(extraargs) + return opts, args + + +def fancyopts(args, options, state, gnu=False): """ read args, parse options, and store options in state @@ -52,7 +78,11 @@ namelist.append(oname) # parse arguments - opts, args = getopt.getopt(args, shortlist, namelist) + if gnu: + parse = gnugetopt + else: + parse = getopt.getopt + opts, args = parse(args, shortlist, namelist) # transfer result to state for opt, val in opts:
--- a/mercurial/filelog.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/filelog.py Fri Feb 27 08:13:42 2009 -0600 @@ -5,12 +5,11 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -from node import bin, nullid -from revlog import revlog +import revlog -class filelog(revlog): +class filelog(revlog.revlog): def __init__(self, opener, path): - revlog.__init__(self, opener, + revlog.revlog.__init__(self, opener, "/".join(("data", self.encodedir(path + ".i")))) # This avoids a collision between a file named foo and a dir named @@ -50,16 +49,16 @@ if meta or text.startswith('\1\n'): mt = "" if meta: - mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] + mt = ["%s: %s\n" % (k, v) for k, v in meta.iteritems()] text = "\1\n%s\1\n%s" % ("".join(mt), text) return self.addrevision(text, transaction, link, p1, p2) def renamed(self, node): - if self.parents(node)[0] != nullid: + if self.parents(node)[0] != revlog.nullid: return False m = self._readmeta(node) if m and "copy" in m: - return (m["copy"], bin(m["copyrev"])) + return (m["copy"], revlog.bin(m["copyrev"])) return False def size(self, rev): @@ -70,7 +69,7 @@ if self.renamed(node): return len(self.read(node)) - return revlog.size(self, rev) + return revlog.revlog.size(self, rev) def cmp(self, node, text): """compare text with a given file revision""" @@ -80,4 +79,4 @@ t2 = self.read(node) return t2 != text - return revlog.cmp(self, node, text) + return revlog.revlog.cmp(self, node, text)
--- a/mercurial/hbisect.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hbisect.py Fri Feb 27 08:13:42 2009 -0600 @@ -102,7 +102,7 @@ if value == perfect: # found a perfect candidate? quit early break - if y < perfect: # all downhill from here? + if y < perfect and rev not in skip: # all downhill from here? for c in children.get(rev, []): poison[c] = True # poison children continue
--- a/mercurial/help.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/help.py Fri Feb 27 08:13:42 2009 -0600 @@ -10,9 +10,9 @@ helptable = ( (["dates"], _("Date Formats"), _(r''' - Some commands allow the user to specify a date: - backout, commit, import, tag: Specify the commit date. - log, revert, update: Select revision(s) by date. + Some commands allow the user to specify a date, e.g.: + * backout, commit, import, tag: Specify the commit date. + * log, revert, update: Select revision(s) by date. Many date formats are valid. Here are some examples: @@ -248,4 +248,145 @@ [diff] section of your hgrc. You do not need to set this option when importing diffs in this format or using them in the mq extension. ''')), + (['templating'], _('Template Usage'), + _(r''' + Mercurial allows you to customize output of commands through + templates. You can either pass in a template from the command line, + via the --template option, or select an existing template-style (--style). + + You can customize output for any "log-like" command: log, outgoing, + incoming, tip, parents, heads and glog are all template-enabled. + + Three styles are packaged with Mercurial: default (the style used + when no explicit preference is passed), compact and changelog. Usage: + + $ hg log -r1 --style changelog + + A template is a piece of text, with markup to invoke variable expansion: + + $ hg log -r1 --template "{node}\n" + b56ce7b07c52de7d5fd79fb89701ea538af65746 + + Strings in curly braces are called keywords. The availability of + keywords depends on the exact context of the templater. These keywords + are usually available for templating a log-like command: + + - author: String. The unmodified author of the changeset. + - branches: String. The name of the branch on which the changeset + was committed. Will be empty if the branch name was default. + - date: Date information. The date when the changeset was committed. + - desc: String. The text of the changeset description. + - files: List of strings. All files modified, added, or removed by + this changeset. + - file_adds: List of strings. Files added by this changeset. + - file_mods: List of strings. Files modified by this changeset. + - file_dels: List of strings. Files removed by this changeset. + - node: String. The changeset identification hash, as a 40-character + hexadecimal string. + - parents: List of strings. The parents of the changeset. + - rev: Integer. The repository-local changeset revision number. + - tags: List of strings. Any tags associated with the changeset. + + The "date" keyword does not produce human-readable output. If you + want to use a date in your output, you can use a filter to process it. + Filters are functions which return a string based on the input variable. + You can also use a chain of filters to get the wanted output: + + $ hg tip --template "{date|isodate}\n" + 2008-08-21 18:22 +0000 + + List of filters: + + - addbreaks: Any text. Add an XHTML "<br />" tag before the end of + every line except the last. + - age: Date. Returns a human-readable age for the given date. + - basename: Any text. Treats the text as a path, and returns the + basename. For example, "foo/bar/baz" becomes "baz". + - date: Date. Returns a date in a Unix date command format, including + the timezone: "Mon Sep 04 15:13:13 2006 0700". + - domain: Any text. Finds the first string that looks like an email + address, and extracts just the domain component. + - email: Any text. Extracts the first string that looks like an email + address. + - escape: Any text. Replaces the special XML/XHTML characters "&", + "<" and ">" with XML entities. + - fill68: Any text. Wraps the text to fit in 68 columns. + - fill76: Any text. Wraps the text to fit in 76 columns. + - firstline: Any text. Returns the first line of text. + - hgdate: Date. Returns the date as a pair of numbers: + "1157407993 25200" (Unix timestamp, timezone offset). + - isodate: Date. Returns the date in ISO 8601 format. + - obfuscate: Any text. Returns the input text rendered as a sequence + of XML entities. + - person: Any text. Returns the text before an email address. + - rfc822date: Date. Returns a date using the same format used + in email headers. + - short: Changeset hash. Returns the short form of a changeset hash, + i.e. a 12-byte hexadecimal string. + - shortdate: Date. Returns a date like "2006-09-04". + - strip: Any text. Strips all leading and trailing whitespace. + - tabindent: Any text. Returns the text, with every line except the + first starting with a tab character. + - urlescape: Any text. Escapes all "special" characters. For example, + "foo bar" becomes "foo%20bar". + - user: Any text. Returns the user portion of an email address. + ''')), + + (['urls'], _('Url Paths'), + _(r''' + Valid URLs are of the form: + + local/filesystem/path (or file://local/filesystem/path) + http://[user[:pass]@]host[:port]/[path] + https://[user[:pass]@]host[:port]/[path] + ssh://[user[:pass]@]host[:port]/[path] + + Paths in the local filesystem can either point to Mercurial + repositories or to bundle files (as created by 'hg bundle' or + 'hg incoming --bundle'). + + An optional identifier after # indicates a particular branch, tag, + or changeset to deal with in the remote repository. + + Some features, such as pushing to http:// and https:// URLs are + only possible if the feature is explicitly enabled on the + remote Mercurial server. + + Some notes about using SSH with Mercurial: + - SSH requires an accessible shell account on the destination machine + and a copy of hg in the remote path or specified with as remotecmd. + - path is relative to the remote user's home directory by default. + Use an extra slash at the start of a path to specify an absolute path: + ssh://example.com//tmp/repository + - Mercurial doesn't use its own compression via SSH; the right thing + to do is to configure it in your ~/.ssh/config, e.g.: + Host *.mylocalnetwork.example.com + Compression no + Host * + Compression yes + Alternatively specify "ssh -C" as your ssh command in your hgrc or + with the --ssh command line option. + + These urls can all be stored in your hgrc with path aliases under the + [paths] section like so: + [paths] + alias1 = URL1 + alias2 = URL2 + ... + + You can then use the alias for any command that uses a url (for example + 'hg pull alias1' would pull from the 'alias1' path). + + Two path aliases are more important because they are used as defaults + when you do not provide the url to a command: + + default: + When you create a repository with hg clone, the clone command saves + the location of the source repository as the 'default' path. This is + then used when you omit a path from the push and pull commands. + + default-push: + The push command will look for a path named 'default-push', and + prefer it over 'default' if both are defined. + ''')), )
--- a/mercurial/hg.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hg.py Fri Feb 27 08:13:42 2009 -0600 @@ -8,7 +8,7 @@ from i18n import _ import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo -import errno, lock, os, shutil, util, extensions +import errno, lock, os, shutil, util, extensions, error import merge as _merge import verify as _verify @@ -161,7 +161,7 @@ # not pointed to by changesets, thus causing verify to # fail src_lock = src_repo.lock() - except lock.LockException: + except error.LockError: copy = False if copy: @@ -252,8 +252,6 @@ note = ", ".join([_("%d files %s") % s for s in stats]) repo.ui.status("%s\n" % note) -def _update(repo, node): return update(repo, node) - def update(repo, node): """update the working directory to node, merging linear changes""" stats = _merge.update(repo, node, False, False, None) @@ -262,6 +260,9 @@ repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) return stats[3] > 0 +# naming conflict in clone() +_update = update + def clean(repo, node, show_stats=True): """forcibly switch the working directory to node, clobbering changes""" stats = _merge.update(repo, node, False, True, None)
--- a/mercurial/hgweb/common.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/common.py Fri Feb 27 08:13:42 2009 -0600 @@ -17,9 +17,10 @@ HTTP_SERVER_ERROR = 500 class ErrorResponse(Exception): - def __init__(self, code, message=None): + def __init__(self, code, message=None, headers=[]): Exception.__init__(self) self.code = code + self.headers = headers if message is not None: self.message = message else:
--- a/mercurial/hgweb/hgweb_mod.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/hgweb_mod.py Fri Feb 27 08:13:42 2009 -0600 @@ -8,9 +8,8 @@ import os, mimetypes from mercurial.node import hex, nullid -from mercurial.repo import RepoError -from mercurial import ui, hg, util, hook -from mercurial import revlog, templater, templatefilters +from mercurial import ui, hg, util, hook, error +from mercurial import templater, templatefilters from common import get_mtime, style_map, ErrorResponse from common import HTTP_OK, HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_SERVER_ERROR from common import HTTP_UNAUTHORIZED, HTTP_METHOD_NOT_ALLOWED @@ -100,7 +99,7 @@ method = getattr(protocol, cmd) return method(self.repo, req) except ErrorResponse, inst: - req.respond(inst.code, protocol.HGTYPE) + req.respond(inst, protocol.HGTYPE) if not inst.message: return [] return '0\n%s\n' % inst.message, @@ -185,17 +184,17 @@ return content - except revlog.LookupError, err: + except error.LookupError, err: req.respond(HTTP_NOT_FOUND, ctype) msg = str(err) if 'manifest' not in msg: msg = 'revision not found: %s' % err.name return tmpl('error', error=msg) - except (RepoError, revlog.RevlogError), inst: + except (error.RepoError, error.RevlogError), inst: req.respond(HTTP_SERVER_ERROR, ctype) return tmpl('error', error=str(inst)) except ErrorResponse, inst: - req.respond(inst.code, ctype) + req.respond(inst, ctype) return tmpl('error', error=inst.message) def templater(self, req): @@ -284,14 +283,13 @@ raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') allow_read = self.configlist('web', 'allow_read') - result = (not allow_read) or (allow_read == ['*']) or (user in allow_read) - if not result: + result = (not allow_read) or (allow_read == ['*']) + if not result or user in allow_read: raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') if op == 'pull' and not self.allowpull: raise ErrorResponse(HTTP_UNAUTHORIZED, 'pull not authorized') - # op is None when checking allow/deny_read permissions for a web-browser request - elif op == 'pull' or op is None: + elif op == 'pull' or op is None: # op is None for interface requests return # enforce that you can only push using POST requests
--- a/mercurial/hgweb/hgwebdir_mod.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/hgwebdir_mod.py Fri Feb 27 08:13:42 2009 -0600 @@ -8,8 +8,7 @@ import os from mercurial.i18n import _ -from mercurial.repo import RepoError -from mercurial import ui, hg, util, templater, templatefilters +from mercurial import ui, hg, util, templater, templatefilters, error from common import ErrorResponse, get_mtime, staticfile, style_map, paritygen,\ get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR from hgweb_mod import hgweb @@ -102,11 +101,11 @@ user = req.env.get('REMOTE_USER') - deny_read = ui.configlist('web', 'deny_read', default=None, untrusted=True) + deny_read = ui.configlist('web', 'deny_read', untrusted=True) if deny_read and (not user or deny_read == ['*'] or user in deny_read): return False - allow_read = ui.configlist('web', 'allow_read', default=None, untrusted=True) + allow_read = ui.configlist('web', 'allow_read', untrusted=True) # by default, allow reading if no allow_read option has been set if (not allow_read) or (allow_read == ['*']) or (user in allow_read): return True @@ -150,7 +149,7 @@ except IOError, inst: msg = inst.strerror raise ErrorResponse(HTTP_SERVER_ERROR, msg) - except RepoError, inst: + except error.RepoError, inst: raise ErrorResponse(HTTP_SERVER_ERROR, str(inst)) # browse subdirectories @@ -169,7 +168,7 @@ return tmpl("notfound", repo=virtual) except ErrorResponse, err: - req.respond(err.code, ctype) + req.respond(err, ctype) return tmpl('error', error=err.message or '') finally: tmpl = None
--- a/mercurial/hgweb/request.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/request.py Fri Feb 27 08:13:42 2009 -0600 @@ -76,6 +76,7 @@ raise TypeError('header value must be string: %r' % v) if isinstance(status, ErrorResponse): + self.header(status.headers) status = statusmessage(status.code) elif status == 200: status = '200 Script output follows'
--- a/mercurial/hgweb/server.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/server.py Fri Feb 27 08:13:42 2009 -0600 @@ -7,8 +7,7 @@ # of the GNU General Public License, incorporated herein by reference. import os, sys, errno, urllib, BaseHTTPServer, socket, SocketServer, traceback -from mercurial import hg, util -from mercurial.repo import RepoError +from mercurial import hg, util, error from hgweb_mod import hgweb from hgwebdir_mod import hgwebdir from mercurial.i18n import _ @@ -249,8 +248,8 @@ elif repo is not None: hgwebobj = hgweb(hg.repository(repo.ui, repo.root)) else: - raise RepoError(_("There is no Mercurial repository here" - " (.hg not found)")) + raise error.RepoError(_("There is no Mercurial repository" + " here (.hg not found)")) return hgwebobj self.application = make_handler()
--- a/mercurial/hgweb/webcommands.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/webcommands.py Fri Feb 27 08:13:42 2009 -0600 @@ -7,10 +7,9 @@ import os, mimetypes, re, cgi, copy import webutil -from mercurial import revlog, archival, templatefilters +from mercurial import error, archival, templatefilters from mercurial.node import short, hex, nullid from mercurial.util import binary, datestr -from mercurial.repo import RepoError from common import paritygen, staticfile, get_contact, ErrorResponse from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND from mercurial import graphmod, util @@ -39,7 +38,7 @@ try: fctx = webutil.filectx(web.repo, req) - except revlog.LookupError, inst: + except error.LookupError, inst: try: content = manifest(web, req, tmpl) req.respond(HTTP_OK, web.ctype) @@ -82,8 +81,8 @@ date=fctx.date(), desc=fctx.description(), branch=webutil.nodebranchnodefault(fctx), - parent=webutil.siblings(fctx.parents()), - child=webutil.siblings(fctx.children()), + parent=webutil.parents(fctx), + child=webutil.children(fctx), rename=webutil.renamelink(fctx), permissions=fctx.manifest().flags(f)) @@ -93,7 +92,7 @@ return manifest(web, req, tmpl) try: return _filerevision(web, tmpl, webutil.filectx(web.repo, req)) - except revlog.LookupError, inst: + except error.LookupError, inst: try: return manifest(web, req, tmpl) except ErrorResponse: @@ -135,8 +134,8 @@ yield tmpl('searchentry', parity=parity.next(), author=ctx.user(), - parent=webutil.siblings(ctx.parents()), - child=webutil.siblings(ctx.children()), + parent=webutil.parents(ctx), + child=webutil.children(ctx), changelogtag=showtags, desc=ctx.description(), date=ctx.date(), @@ -169,7 +168,7 @@ hi = len(web.repo) - 1 try: ctx = web.repo[hi] - except RepoError: + except error.RepoError: return _search(web, tmpl, hi) # XXX redirect to 404 page? def changelist(limit=0, **map): @@ -183,8 +182,8 @@ l.insert(0, {"parity": parity.next(), "author": ctx.user(), - "parent": webutil.siblings(ctx.parents(), i - 1), - "child": webutil.siblings(ctx.children(), i + 1), + "parent": webutil.parents(ctx, i - 1), + "child": webutil.children(ctx, i + 1), "changelogtag": showtags, "desc": ctx.description(), "date": ctx.date(), @@ -228,7 +227,6 @@ ctx = webutil.changectx(web.repo, req) showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node()) showbranch = webutil.nodebranchnodefault(ctx) - parents = ctx.parents() files = [] parity = paritygen(web.stripecount) @@ -244,8 +242,8 @@ diff=diffs, rev=ctx.rev(), node=ctx.hex(), - parent=webutil.siblings(parents), - child=webutil.siblings(ctx.children()), + parent=webutil.parents(ctx), + child=webutil.children(ctx), changesettag=showtags, changesetbranch=showbranch, author=ctx.user(), @@ -275,7 +273,7 @@ l = len(path) abspath = "/" + path - for f, n in mf.items(): + for f, n in mf.iteritems(): if f[:l] != path: continue remain = f[l:] @@ -386,7 +384,7 @@ parity = paritygen(web.stripecount) b = web.repo.branchtags() - l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.items()] + l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.iteritems()] for r,n,t in util.sort(l): yield {'parity': parity.next(), 'branch': t, @@ -443,12 +441,9 @@ if fctx is not None: n = fctx.node() path = fctx.path() - parents = fctx.parents() - p1 = parents and parents[0].node() or nullid else: n = ctx.node() # path already defined in except clause - parents = ctx.parents() parity = paritygen(web.stripecount) diffs = webutil.diffs(web.repo, tmpl, fctx or ctx, [path], parity) @@ -463,8 +458,8 @@ author=ctx.user(), rename=rename, branch=webutil.nodebranchnodefault(ctx), - parent=webutil.siblings(parents), - child=webutil.siblings(ctx.children()), + parent=webutil.parents(ctx), + child=webutil.children(ctx), diff=diffs) diff = filediff @@ -511,8 +506,8 @@ desc=fctx.description(), rename=webutil.renamelink(fctx), branch=webutil.nodebranchnodefault(fctx), - parent=webutil.siblings(fctx.parents()), - child=webutil.siblings(fctx.children()), + parent=webutil.parents(fctx), + child=webutil.children(fctx), permissions=fctx.manifest().flags(f)) def filelog(web, req, tmpl): @@ -521,7 +516,7 @@ fctx = webutil.filectx(web.repo, req) f = fctx.path() fl = fctx.filelog() - except revlog.LookupError: + except error.LookupError: f = webutil.cleanpath(web.repo, req.form['file'][0]) fl = web.repo.file(f) numrevs = len(fl) @@ -556,8 +551,8 @@ "author": iterfctx.user(), "date": iterfctx.date(), "rename": webutil.renamelink(iterfctx), - "parent": webutil.siblings(iterfctx.parents()), - "child": webutil.siblings(iterfctx.children()), + "parent": webutil.parents(iterfctx), + "child": webutil.children(iterfctx), "desc": iterfctx.description(), "tags": webutil.nodetagsdict(repo, iterfctx.node()), "branch": webutil.nodebranchnodefault(iterfctx),
--- a/mercurial/hgweb/webutil.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/webutil.py Fri Feb 27 08:13:42 2009 -0600 @@ -7,10 +7,8 @@ # of the GNU General Public License, incorporated herein by reference. import os, copy -from mercurial import match, patch +from mercurial import match, patch, util, error from mercurial.node import hex, nullid -from mercurial.repo import RepoError -from mercurial import util def up(p): if p[0] != "/": @@ -55,12 +53,12 @@ yield {"label": label, "node": node} yield {"label": "tip", "node": "tip"} - except RepoError: + except error.RepoError: pass return nav -def siblings(siblings=[], hiderev=None, **args): +def _siblings(siblings=[], hiderev=None): siblings = [s for s in siblings if s.node() != nullid] if len(siblings) == 1 and siblings[0].rev() == hiderev: return @@ -69,11 +67,17 @@ d['user'] = s.user() d['date'] = s.date() d['description'] = s.description() + d['branch'] = s.branch() if hasattr(s, 'path'): d['file'] = s.path() - d.update(args) yield d +def parents(ctx, hide=None): + return _siblings(ctx.parents(), hide) + +def children(ctx, hide=None): + return _siblings(ctx.children(), hide) + def renamelink(fctx): r = fctx.renamed() if r: @@ -124,7 +128,7 @@ try: ctx = repo[changeid] - except RepoError: + except error.RepoError: man = repo.manifest ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))] @@ -138,7 +142,7 @@ changeid = req.form['filenode'][0] try: fctx = repo[changeid][path] - except RepoError: + except error.RepoError: fctx = repo.filectx(path, fileid=changeid) return fctx
--- a/mercurial/hgweb/wsgicgi.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hgweb/wsgicgi.py Fri Feb 27 08:13:42 2009 -0600 @@ -15,7 +15,7 @@ util.set_binary(sys.stdin) util.set_binary(sys.stdout) - environ = dict(os.environ.items()) + environ = dict(os.environ.iteritems()) environ.setdefault('PATH_INFO', '') if '.cgi' in environ['PATH_INFO']: environ['PATH_INFO'] = environ['PATH_INFO'].split('.cgi', 1)[1]
--- a/mercurial/hook.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/hook.py Fri Feb 27 08:13:42 2009 -0600 @@ -49,7 +49,7 @@ (hname, funcname)) try: r = obj(ui=ui, repo=repo, hooktype=name, **args) - except (KeyboardInterrupt, util.SignalInterrupt): + except KeyboardInterrupt: raise except Exception, exc: if isinstance(exc, util.Abort): @@ -70,7 +70,13 @@ def _exthook(ui, repo, name, cmd, args, throw): ui.note(_("running hook %s: %s\n") % (name, cmd)) - env = dict([('HG_' + k.upper(), v) for k, v in args.iteritems()]) + + env = {} + for k, v in args.iteritems(): + if callable(v): + v = v() + env['HG_' + k.upper()] = v + if repo: cwd = repo.root else:
--- a/mercurial/httprepo.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/httprepo.py Fri Feb 27 08:13:42 2009 -0600 @@ -9,8 +9,7 @@ from node import bin, hex, nullid from i18n import _ import repo, os, urllib, urllib2, urlparse, zlib, util, httplib -import errno, socket, changegroup, statichttprepo -import url +import errno, socket, changegroup, statichttprepo, error, url def zgenerator(f): zd = zlib.decompressobj() @@ -39,6 +38,12 @@ self.urlopener = url.opener(ui, authinfo) + def __del__(self): + for h in self.urlopener.handlers: + h.close() + if hasattr(h, "close_all"): + h.close_all() + def url(self): return self.path @@ -48,7 +53,7 @@ if self.caps is None: try: self.caps = util.set(self.do_read('capabilities').split()) - except repo.RepoError: + except error.RepoError: self.caps = util.set() self.ui.debug(_('capabilities: %s\n') % (' '.join(self.caps or ['none']))) @@ -99,19 +104,19 @@ proto.startswith('text/plain') or proto.startswith('application/hg-changegroup')): self.ui.debug(_("Requested URL: '%s'\n") % cu) - raise repo.RepoError(_("'%s' does not appear to be an hg repository") - % self._url) + raise error.RepoError(_("'%s' does not appear to be an hg repository") + % self._url) if proto.startswith('application/mercurial-'): try: version = proto.split('-', 1)[1] version_info = tuple([int(n) for n in version.split('.')]) except ValueError: - raise repo.RepoError(_("'%s' sent a broken Content-Type " - "header (%s)") % (self._url, proto)) + raise error.RepoError(_("'%s' sent a broken Content-Type " + "header (%s)") % (self._url, proto)) if version_info > (0, 1): - raise repo.RepoError(_("'%s' uses newer protocol %s") % - (self._url, version)) + raise error.RepoError(_("'%s' uses newer protocol %s") % + (self._url, version)) return resp @@ -129,14 +134,14 @@ success, data = d[:-1].split(' ', 1) if int(success): return bin(data) - raise repo.RepoError(data) + raise error.RepoError(data) def heads(self): d = self.do_read("heads") try: return map(bin, d[:-1].split(" ")) except: - raise util.UnexpectedOutput(_("unexpected response:"), d) + raise error.ResponseError(_("unexpected response:"), d) def branches(self, nodes): n = " ".join(map(hex, nodes)) @@ -145,7 +150,7 @@ br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] return br except: - raise util.UnexpectedOutput(_("unexpected response:"), d) + raise error.ResponseError(_("unexpected response:"), d) def between(self, pairs): batch = 8 # avoid giant requests @@ -156,7 +161,7 @@ try: r += [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] except: - raise util.UnexpectedOutput(_("unexpected response:"), d) + raise error.ResponseError(_("unexpected response:"), d) return r def changegroup(self, nodes, kind): @@ -201,7 +206,7 @@ try: ret = int(resp_code) except ValueError, err: - raise util.UnexpectedOutput( + raise error.ResponseError( _('push failed (unexpected response):'), resp) self.ui.write(output) return ret @@ -233,6 +238,6 @@ inst = httprepository(ui, path) inst.between([(nullid, nullid)]) return inst - except repo.RepoError: + except error.RepoError: ui.note('(falling back to static-http)\n') return statichttprepo.instance(ui, "static-" + path, create)
--- a/mercurial/i18n.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/i18n.py Fri Feb 27 08:13:42 2009 -0600 @@ -7,7 +7,45 @@ of the GNU General Public License, incorporated herein by reference. """ -import gettext -t = gettext.translation('hg', fallback=1) -gettext = t.gettext +import gettext, sys, os + +# modelled after templater.templatepath: +if hasattr(sys, 'frozen'): + module = sys.executable +else: + module = __file__ + +base = os.path.dirname(module) +for dir in ('.', '..'): + localedir = os.path.normpath(os.path.join(base, dir, 'locale')) + if os.path.isdir(localedir): + break + +t = gettext.translation('hg', localedir, fallback=True) + +def gettext(message): + """Translate message. + + The message is looked up in the catalog to get a Unicode string, + which is encoded in the local encoding before being returned. + + Important: message is restricted to characters in the encoding + given by sys.getdefaultencoding() which is most likely 'ascii'. + """ + # If message is None, t.ugettext will return u'None' as the + # translation whereas our callers expect us to return None. + if message is None: + return message + + # We cannot just run the text through util.tolocal since that + # leads to infinite recursion when util._encoding is invalid. + try: + u = t.ugettext(message) + return u.encode(util._encoding, "replace") + except LookupError: + return message + _ = gettext + +# Moved after _ because of circular import. +import util
--- a/mercurial/ignore.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/ignore.py Fri Feb 27 08:13:42 2009 -0600 @@ -60,7 +60,7 @@ warn(_("%s: ignoring invalid syntax '%s'\n") % (f, s)) continue pat = syntax + line - for s, rels in syntaxes.items(): + for s, rels in syntaxes.iteritems(): if line.startswith(rels): pat = line break @@ -83,7 +83,7 @@ util.matcher(root, inc=allpats, src='.hgignore')) except util.Abort: # Re-raise an exception where the src is the right file - for f, patlist in pats.items(): + for f, patlist in pats.iteritems(): files, ignorefunc, anypats = ( util.matcher(root, inc=patlist, src=f))
--- a/mercurial/keepalive.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/keepalive.py Fri Feb 27 08:13:42 2009 -0600 @@ -197,7 +197,7 @@ def close_all(self): """close all open connections""" - for host, conns in self._cm.get_all().items(): + for host, conns in self._cm.get_all().iteritems(): for h in conns: self._cm.remove(h) h.close() @@ -389,6 +389,63 @@ self._rbuf = '' return s + # stolen from Python SVN #68532 to fix issue1088 + def _read_chunked(self, amt): + chunk_left = self.chunk_left + value = '' + + # XXX This accumulates chunks by repeated string concatenation, + # which is not efficient as the number or size of chunks gets big. + while True: + if chunk_left is None: + line = self.fp.readline() + i = line.find(';') + if i >= 0: + line = line[:i] # strip chunk-extensions + try: + chunk_left = int(line, 16) + except ValueError: + # close the connection as protocol synchronisation is + # probably lost + self.close() + raise IncompleteRead(value) + if chunk_left == 0: + break + if amt is None: + value += self._safe_read(chunk_left) + elif amt < chunk_left: + value += self._safe_read(amt) + self.chunk_left = chunk_left - amt + return value + elif amt == chunk_left: + value += self._safe_read(amt) + self._safe_read(2) # toss the CRLF at the end of the chunk + self.chunk_left = None + return value + else: + value += self._safe_read(chunk_left) + amt -= chunk_left + + # we read the whole chunk, get another + self._safe_read(2) # toss the CRLF at the end of the chunk + chunk_left = None + + # read and discard trailer up to the CRLF terminator + ### note: we shouldn't have any trailers! + while True: + line = self.fp.readline() + if not line: + # a vanishingly small number of sites EOF without + # sending the trailer + break + if line == '\r\n': + break + + # we read everything; close the "file" + self.close() + + return value + def readline(self, limit=-1): data = "" i = self._rbuf.find('\n')
--- a/mercurial/localrepo.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/localrepo.py Fri Feb 27 08:13:42 2009 -0600 @@ -10,7 +10,7 @@ import repo, changegroup import changelog, dirstate, filelog, manifest, context, weakref import lock, transaction, stat, errno, ui, store -import os, revlog, time, util, extensions, hook, inspect +import os, time, util, extensions, hook, inspect, error import match as match_ import merge as merge_ @@ -47,9 +47,9 @@ reqfile.write("%s\n" % r) reqfile.close() else: - raise repo.RepoError(_("repository %s not found") % path) + raise error.RepoError(_("repository %s not found") % path) elif create: - raise repo.RepoError(_("repository %s already exists") % path) + raise error.RepoError(_("repository %s already exists") % path) else: # find requirements requirements = [] @@ -57,7 +57,7 @@ requirements = self.opener("requires").read().splitlines() for r in requirements: if r not in self.supported: - raise repo.RepoError(_("requirement '%s' not supported") % r) + raise error.RepoError(_("requirement '%s' not supported") % r) except IOError, inst: if inst.errno != errno.ENOENT: raise @@ -88,6 +88,10 @@ def __getattr__(self, name): if name == 'changelog': self.changelog = changelog.changelog(self.sopener) + if 'HG_PENDING' in os.environ: + p = os.environ['HG_PENDING'] + if p.startswith(self.root): + self.changelog.readpending('00changelog.i.a') self.sopener.defversion = self.changelog.version return self.changelog if name == 'manifest': @@ -177,7 +181,7 @@ else: try: prevtags = self.filectx('.hgtags', parent).data() - except revlog.LookupError: + except error.LookupError: pass fp = self.wfile('.hgtags', 'wb') if prevtags: @@ -265,7 +269,7 @@ h.append(n) filetags[key] = (bin_n, h) - for k, nh in filetags.items(): + for k, nh in filetags.iteritems(): if k not in globaltags: globaltags[k] = nh tagtypes[k] = tagtype @@ -301,7 +305,7 @@ self.tagscache = {} self._tagstypecache = {} - for k,nh in globaltags.items(): + for k, nh in globaltags.iteritems(): n = nh[0] if n != nullid: self.tagscache[k] = n @@ -332,7 +336,7 @@ rev = c.rev() try: fnode = c.filenode('.hgtags') - except revlog.LookupError: + except error.LookupError: continue ret.append((rev, node, fnode)) if fnode in last: @@ -343,7 +347,7 @@ def tagslist(self): '''return a list of tags ordered by revision''' l = [] - for t, n in self.tags().items(): + for t, n in self.tags().iteritems(): try: r = self.changelog.rev(n) except: @@ -355,11 +359,12 @@ '''return the tags associated with a node''' if not self.nodetagscache: self.nodetagscache = {} - for t, n in self.tags().items(): + for t, n in self.tags().iteritems(): self.nodetagscache.setdefault(n, []).append(t) return self.nodetagscache.get(node, []) def _branchtags(self, partial, lrev): + # TODO: rename this function? tiprev = len(self) - 1 if lrev != tiprev: self._updatebranchcache(partial, lrev+1, tiprev+1) @@ -367,7 +372,7 @@ return partial - def branchtags(self): + def _branchheads(self): tip = self.changelog.tip() if self.branchcache is not None and self._branchcachetip == tip: return self.branchcache @@ -385,18 +390,38 @@ partial = self._ubranchcache self._branchtags(partial, lrev) + # this private cache holds all heads (not just tips) + self._ubranchcache = partial # the branch cache is stored on disk as UTF-8, but in the local # charset internally - for k, v in partial.items(): + for k, v in partial.iteritems(): self.branchcache[util.tolocal(k)] = v - self._ubranchcache = partial return self.branchcache + + def branchtags(self): + '''return a dict where branch names map to the tipmost head of + the branch, open heads come before closed''' + bt = {} + for bn, heads in self._branchheads().iteritems(): + head = None + for i in range(len(heads)-1, -1, -1): + h = heads[i] + if 'close' not in self.changelog.read(h)[5]: + head = h + break + # no open heads were found + if head is None: + head = heads[-1] + bt[bn] = head + return bt + + def _readbranchcache(self): partial = {} try: - f = self.opener("branch.cache") + f = self.opener("branchheads.cache") lines = f.read().split('\n') f.close() except (IOError, OSError): @@ -411,8 +436,8 @@ for l in lines: if not l: continue node, label = l.split(" ", 1) - partial[label.strip()] = bin(node) - except (KeyboardInterrupt, util.SignalInterrupt): + partial.setdefault(label.strip(), []).append(bin(node)) + except KeyboardInterrupt: raise except Exception, inst: if self.ui.debugflag: @@ -422,10 +447,11 @@ def _writebranchcache(self, branches, tip, tiprev): try: - f = self.opener("branch.cache", "w", atomictemp=True) + f = self.opener("branchheads.cache", "w", atomictemp=True) f.write("%s %s\n" % (hex(tip), tiprev)) - for label, node in branches.iteritems(): - f.write("%s %s\n" % (hex(node), label)) + for label, nodes in branches.iteritems(): + for node in nodes: + f.write("%s %s\n" % (hex(node), label)) f.rename() except (IOError, OSError): pass @@ -434,7 +460,12 @@ for r in xrange(start, end): c = self[r] b = c.branch() - partial[b] = c.node() + bheads = partial.setdefault(b, []) + bheads.append(c.node()) + for p in c.parents(): + pn = p.node() + if pn in bheads: + bheads.remove(pn) def lookup(self, key): if isinstance(key, int): @@ -460,7 +491,7 @@ key = hex(key) except: pass - raise repo.RepoError(_("unknown revision '%s'") % key) + raise error.RepoError(_("unknown revision '%s'") % key) def local(self): return True @@ -566,7 +597,7 @@ # abort here if the journal already exists if os.path.exists(self.sjoin("journal")): - raise repo.RepoError(_("journal already exists - run hg recover")) + raise error.RepoError(_("journal already exists - run hg recover")) # save dirstate for rollback try: @@ -637,7 +668,7 @@ def _lock(self, lockname, wait, releasefn, acquirefn, desc): try: l = lock.lock(lockname, 0, releasefn, desc=desc) - except lock.LockHeld, inst: + except error.LockHeld, inst: if not wait: raise self.ui.warn(_("waiting for lock on %s held by %r\n") % @@ -749,6 +780,8 @@ match=None, force=False, force_editor=False, p1=None, p2=None, extra={}, empty_ok=False): wlock = lock = None + if extra.get("close"): + force = True if files: files = util.unique(files) try: @@ -926,10 +959,13 @@ raise util.Abort(_("empty commit message")) text = '\n'.join(lines) + self.changelog.delayupdate() n = self.changelog.add(mn, changed + removed, text, trp, p1, p2, user, wctx.date(), extra) + p = lambda: self.changelog.writepending() and self.root or "" self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, - parent2=xp2) + parent2=xp2, pending=p) + self.changelog.finalize(trp) tr.close() if self.branchcache: @@ -1023,7 +1059,7 @@ wlock = self.wlock(False) for f in fixup: self.dirstate.normal(f) - except lock.LockException: + except lock.LockError: pass finally: del wlock @@ -1162,59 +1198,33 @@ finally: del wlock - def heads(self, start=None): + def heads(self, start=None, closed=True): heads = self.changelog.heads(start) + def display(head): + if closed: + return True + extras = self.changelog.read(head)[5] + return ('close' not in extras) # sort the output in rev descending order - heads = [(-self.changelog.rev(h), h) for h in heads] + heads = [(-self.changelog.rev(h), h) for h in heads if display(h)] return [n for (r, n) in util.sort(heads)] - def branchheads(self, branch=None, start=None): + def branchheads(self, branch=None, start=None, closed=True): if branch is None: branch = self[None].branch() - branches = self.branchtags() + branches = self._branchheads() if branch not in branches: return [] - # The basic algorithm is this: - # - # Start from the branch tip since there are no later revisions that can - # possibly be in this branch, and the tip is a guaranteed head. - # - # Remember the tip's parents as the first ancestors, since these by - # definition are not heads. - # - # Step backwards from the brach tip through all the revisions. We are - # guaranteed by the rules of Mercurial that we will now be visiting the - # nodes in reverse topological order (children before parents). - # - # If a revision is one of the ancestors of a head then we can toss it - # out of the ancestors set (we've already found it and won't be - # visiting it again) and put its parents in the ancestors set. - # - # Otherwise, if a revision is in the branch it's another head, since it - # wasn't in the ancestor list of an existing head. So add it to the - # head list, and add its parents to the ancestor list. - # - # If it is not in the branch ignore it. - # - # Once we have a list of heads, use nodesbetween to filter out all the - # heads that cannot be reached from startrev. There may be a more - # efficient way to do this as part of the previous algorithm. - - set = util.set - heads = [self.changelog.rev(branches[branch])] - # Don't care if ancestors contains nullrev or not. - ancestors = set(self.changelog.parentrevs(heads[0])) - for rev in xrange(heads[0] - 1, nullrev, -1): - if rev in ancestors: - ancestors.update(self.changelog.parentrevs(rev)) - ancestors.remove(rev) - elif self[rev].branch() == branch: - heads.append(rev) - ancestors.update(self.changelog.parentrevs(rev)) - heads = [self.changelog.node(rev) for rev in heads] + bheads = branches[branch] + # the cache returns heads ordered lowest to highest + bheads.reverse() if start is not None: - heads = self.changelog.nodesbetween([start], heads)[2] - return heads + # filter out the heads that cannot be reached from startrev + bheads = self.changelog.nodesbetween([start], bheads)[2] + if not closed: + bheads = [h for h in bheads if + ('close' not in self.changelog.read(h)[5])] + return bheads def branches(self, nodes): if not nodes: @@ -1393,7 +1403,8 @@ # sanity check our fetch list for f in fetch.keys(): if f in m: - raise repo.RepoError(_("already have changeset ") + short(f[:4])) + raise error.RepoError(_("already have changeset ") + + short(f[:4])) if base.keys() == [nullid]: if force: @@ -1579,7 +1590,7 @@ if self.ui.verbose or source == 'bundle': self.ui.status(_("%d changesets found\n") % len(nodes)) if self.ui.debugflag: - self.ui.debug(_("List of changesets:\n")) + self.ui.debug(_("list of changesets:\n")) for node in nodes: self.ui.debug("%s\n" % hex(node)) @@ -1756,7 +1767,7 @@ # we only need to see a diff. deltamf = mnfst.readdelta(mnfstnode) # For each line in the delta - for f, fnode in deltamf.items(): + for f, fnode in deltamf.iteritems(): f = changedfiles.get(f, None) # And if the file is in the list of files we care # about. @@ -2030,9 +2041,6 @@ revisions += len(fl) - o files += 1 - # make changelog see real files again - cl.finalize(trp) - newheads = len(self.changelog.heads()) heads = "" if oldheads and newheads != oldheads: @@ -2043,9 +2051,13 @@ % (changesets, revisions, files, heads)) if changesets > 0: + p = lambda: self.changelog.writepending() and self.root or "" self.hook('pretxnchangegroup', throw=True, node=hex(self.changelog.node(cor+1)), source=srctype, - url=url) + url=url, pending=p) + + # make changelog see real files again + cl.finalize(trp) tr.close() finally: @@ -2075,7 +2087,7 @@ try: resp = int(l) except ValueError: - raise util.UnexpectedOutput( + raise error.ResponseError( _('Unexpected response from remote server:'), l) if resp == 1: raise util.Abort(_('operation forbidden by server')) @@ -2088,7 +2100,7 @@ try: total_files, total_bytes = map(int, l.split(' ', 1)) except (ValueError, TypeError): - raise util.UnexpectedOutput( + raise error.ResponseError( _('Unexpected response from remote server:'), l) self.ui.status(_('%d files to transfer, %s of data\n') % (total_files, util.bytecount(total_bytes))) @@ -2100,7 +2112,7 @@ name, size = l.split('\0', 1) size = int(size) except (ValueError, TypeError): - raise util.UnexpectedOutput( + raise error.ResponseError( _('Unexpected response from remote server:'), l) self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size))) ofp = self.sopener(name, 'w')
--- a/mercurial/lock.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/lock.py Fri Feb 27 08:13:42 2009 -0600 @@ -5,20 +5,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -import errno, os, socket, time, util - -class LockException(IOError): - def __init__(self, errno, strerror, filename, desc): - IOError.__init__(self, errno, strerror, filename) - self.desc = desc - -class LockHeld(LockException): - def __init__(self, errno, filename, desc, locker): - LockException.__init__(self, errno, 'Lock held', filename, desc) - self.locker = locker - -class LockUnavailable(LockException): - pass +import errno, os, socket, time, util, error class lock(object): # lock is symlink on platforms that support it, file on others. @@ -48,14 +35,14 @@ try: self.trylock() return 1 - except LockHeld, inst: + except error.LockHeld, inst: if timeout != 0: time.sleep(1) if timeout > 0: timeout -= 1 continue - raise LockHeld(errno.ETIMEDOUT, inst.filename, self.desc, - inst.locker) + raise error.LockHeld(errno.ETIMEDOUT, inst.filename, self.desc, + inst.locker) def trylock(self): if lock._host is None: @@ -69,11 +56,11 @@ if why.errno == errno.EEXIST: locker = self.testlock() if locker is not None: - raise LockHeld(errno.EAGAIN, self.f, self.desc, - locker) + raise error.LockHeld(errno.EAGAIN, self.f, self.desc, + locker) else: - raise LockUnavailable(why.errno, why.strerror, - why.filename, self.desc) + raise error.LockUnavailable(why.errno, why.strerror, + why.filename, self.desc) def testlock(self): """return id of locker if lock is valid, else None. @@ -106,7 +93,7 @@ l.trylock() os.unlink(self.f) l.release() - except (LockHeld, LockUnavailable): + except error.LockError: return locker def release(self):
--- a/mercurial/lsprof.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/lsprof.py Fri Feb 27 08:13:42 2009 -0600 @@ -88,7 +88,7 @@ try: mname = _fn2mod[code.co_filename] except KeyError: - for k, v in sys.modules.items(): + for k, v in sys.modules.iteritems(): if v is None: continue if not hasattr(v, '__file__'):
--- a/mercurial/manifest.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/manifest.py Fri Feb 27 08:13:42 2009 -0600 @@ -5,10 +5,8 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -from node import bin, hex, nullid -from revlog import revlog, RevlogError from i18n import _ -import array, struct, mdiff, parsers, util +import array, struct, mdiff, parsers, util, error, revlog class manifestdict(dict): def __init__(self, mapping=None, flags=None): @@ -23,11 +21,11 @@ def copy(self): return manifestdict(dict.copy(self), dict.copy(self._flags)) -class manifest(revlog): +class manifest(revlog.revlog): def __init__(self, opener): self.mapcache = None self.listcache = None - revlog.__init__(self, opener, "00manifest.i") + revlog.revlog.__init__(self, opener, "00manifest.i") def parse(self, lines): mfdict = manifestdict() @@ -39,7 +37,8 @@ return self.parse(mdiff.patchtext(self.revdiff(r - 1, r))) def read(self, node): - if node == nullid: return manifestdict() # don't upset local cache + if node == revlog.nullid: + return manifestdict() # don't upset local cache if self.mapcache and self.mapcache[0] == node: return self.mapcache[1] text = self.revision(node) @@ -101,7 +100,7 @@ return None, None l = text[start:end] f, n = l.split('\0') - return bin(n[:40]), n[40:-1] + return revlog.bin(n[:40]), n[40:-1] def add(self, map, transaction, link, p1=None, p2=None, changed=None): @@ -125,7 +124,8 @@ def checkforbidden(l): for f in l: if '\n' in f or '\r' in f: - raise RevlogError(_("'\\n' and '\\r' disallowed in filenames")) + raise error.RevlogError( + _("'\\n' and '\\r' disallowed in filenames")) # if we're using the listcache, make sure it is valid and # parented by the same node we're diffing against @@ -135,7 +135,8 @@ # if this is changed to support newlines in filenames, # be sure to check the templates/ dir again (especially *-raw.tmpl) - text = ["%s\000%s%s\n" % (f, hex(map[f]), map.flags(f)) + hex, flags = revlog.hex, map.flags + text = ["%s\000%s%s\n" % (f, hex(map[f]), flags(f)) for f in files] self.listcache = array.array('c', "".join(text)) cachedelta = None @@ -163,7 +164,7 @@ # bs will either be the index of the item or the insert point start, end = self._search(addbuf, f, start) if w[1] == 0: - l = "%s\000%s%s\n" % (f, hex(map[f]), map.flags(f)) + l = "%s\000%s%s\n" % (f, revlog.hex(map[f]), map.flags(f)) else: l = "" if start == end and w[1] == 1:
--- a/mercurial/merge.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/merge.py Fri Feb 27 08:13:42 2009 -0600 @@ -36,7 +36,7 @@ def _write(self): f = self._repo.opener("merge/state", "w") f.write(hex(self._local) + "\n") - for d, v in self._state.items(): + for d, v in self._state.iteritems(): f.write("\0".join([d] + v) + "\n") def add(self, fcl, fco, fca, fd, flags): hash = util.sha1(fcl.path()).hexdigest() @@ -166,7 +166,7 @@ dirs = repo.ui.configbool("merge", "followdirs", True) copy, diverge = copies.copies(repo, p1, p2, pa, dirs) copied = dict.fromkeys(copy.values()) - for of, fl in diverge.items(): + for of, fl in diverge.iteritems(): act("divergent renames", "dr", of, fl) # Compare manifests @@ -220,6 +220,7 @@ "use (c)hanged version or (d)elete?") % f, _("[cd]"), _("c")) == _("d"): act("prompt delete", "r", f) + act("prompt keep", "a", f) else: act("other deleted", "r", f) else: @@ -367,6 +368,9 @@ repo.dirstate.remove(f) else: repo.dirstate.forget(f) + elif m == "a": # re-add + if not branchmerge: + repo.dirstate.add(f) elif m == "f": # forget repo.dirstate.forget(f) elif m == "e": # exec change
--- a/mercurial/osutil.py Sun Jan 25 19:15:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -import os -import stat as _stat - -def _mode_to_kind(mode): - if _stat.S_ISREG(mode): return _stat.S_IFREG - if _stat.S_ISDIR(mode): return _stat.S_IFDIR - if _stat.S_ISLNK(mode): return _stat.S_IFLNK - if _stat.S_ISBLK(mode): return _stat.S_IFBLK - if _stat.S_ISCHR(mode): return _stat.S_IFCHR - if _stat.S_ISFIFO(mode): return _stat.S_IFIFO - if _stat.S_ISSOCK(mode): return _stat.S_IFSOCK - return mode - -def listdir(path, stat=False, skip=None): - '''listdir(path, stat=False) -> list_of_tuples - - Return a sorted list containing information about the entries - in the directory. - - If stat is True, each element is a 3-tuple: - - (name, type, stat object) - - Otherwise, each element is a 2-tuple: - - (name, type) - ''' - result = [] - prefix = path - if not prefix.endswith(os.sep): - prefix += os.sep - names = os.listdir(path) - names.sort() - for fn in names: - st = os.lstat(prefix + fn) - if fn == skip and _stat.S_ISDIR(st.st_mode): - return [] - if stat: - result.append((fn, _mode_to_kind(st.st_mode), st)) - else: - result.append((fn, _mode_to_kind(st.st_mode))) - return result
--- a/mercurial/patch.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/patch.py Fri Feb 27 08:13:42 2009 -0600 @@ -9,7 +9,7 @@ from i18n import _ from node import hex, nullid, short import base85, cmdutil, mdiff, util, revlog, diffhelpers, copies -import cStringIO, email.Parser, os, re, errno +import cStringIO, email.Parser, os, re, errno, math import sys, tempfile, zlib gitre = re.compile('diff --git a/(.*) b/(.*)') @@ -52,9 +52,9 @@ # attempt to detect the start of a patch # (this heuristic is borrowed from quilt) - diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + - 'retrieving revision [0-9]+(\.[0-9]+)*$|' + - '(---|\*\*\*)[ \t])', re.MULTILINE) + diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + r'retrieving revision [0-9]+(\.[0-9]+)*$|' + r'(---|\*\*\*)[ \t])', re.MULTILINE) fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') tmpfp = os.fdopen(fd, 'w') @@ -751,7 +751,7 @@ nulla = afile_orig == "/dev/null" nullb = bfile_orig == "/dev/null" abase, afile = pathstrip(afile_orig, strip) - gooda = not nulla and os.path.exists(afile) + gooda = not nulla and util.lexists(afile) bbase, bfile = pathstrip(bfile_orig, strip) if afile == bfile: goodb = gooda @@ -794,9 +794,7 @@ def readline(self): if self.buf: - l = self.buf[0] - del self.buf[0] - return l + return self.buf.pop(0) return self.fp.readline() def __iter__(self): @@ -1059,7 +1057,7 @@ gp = patches[f] if gp and gp.mode: islink, isexec = gp.mode - dst = os.path.join(repo.root, gp.path) + dst = repo.wjoin(gp.path) # patch won't create empty files if gp.op == 'ADD' and not os.path.exists(dst): flags = (isexec and 'x' or '') + (islink and 'l' or '') @@ -1139,7 +1137,7 @@ try: return internalpatch(patchname, ui, strip, cwd, files) except NoHunks: - patcher = util.find_exe('gpatch') or util.find_exe('patch') + patcher = util.find_exe('gpatch') or util.find_exe('patch') or 'patch' ui.debug(_('no valid hunks found; trying with %r instead\n') % patcher) if util.needbinarypatch(): @@ -1203,9 +1201,6 @@ if node1 is None, use first dirstate parent instead. if node2 is None, compare node1 with working directory.''' - if not match: - match = cmdutil.matchall(repo) - if opts is None: opts = mdiff.defaultopts @@ -1340,19 +1335,61 @@ for chunk in diff(repo, prev, node, opts=opts): fp.write(chunk) - if fp not in (sys.stdout, repo.ui): - fp.close() for seqno, rev in enumerate(revs): single(rev, seqno+1, fp) -def diffstat(patchlines): - if not util.find_exe('diffstat'): - return - output = util.filter('\n'.join(patchlines), - 'diffstat -p1 -w79 2>%s' % util.nulldev) - stat = [l.lstrip() for l in output.splitlines(True)] - last = stat.pop() - stat.insert(0, last) - stat = ''.join(stat) - return stat +def diffstatdata(lines): + filename, adds, removes = None, 0, 0 + for line in lines: + if line.startswith('diff'): + if filename: + yield (filename, adds, removes) + # set numbers to 0 anyway when starting new file + adds, removes = 0, 0 + if line.startswith('diff --git'): + filename = gitre.search(line).group(1) + else: + # format: "diff -r ... -r ... file name" + filename = line.split(None, 5)[-1] + elif line.startswith('+') and not line.startswith('+++'): + adds += 1 + elif line.startswith('-') and not line.startswith('---'): + removes += 1 + if filename: + yield (filename, adds, removes) + +def diffstat(lines): + output = [] + stats = list(diffstatdata(lines)) + width = util.termwidth() - 2 + + maxtotal, maxname = 0, 0 + totaladds, totalremoves = 0, 0 + for filename, adds, removes in stats: + totaladds += adds + totalremoves += removes + maxname = max(maxname, len(filename)) + maxtotal = max(maxtotal, adds+removes) + + countwidth = len(str(maxtotal)) + graphwidth = width - countwidth - maxname + if graphwidth < 10: + graphwidth = 10 + + factor = int(math.ceil(float(maxtotal) / graphwidth)) + + for filename, adds, removes in stats: + # If diffstat runs out of room it doesn't print anything, which + # isn't very useful, so always print at least one + or - if there + # were at least some changes + pluses = '+' * max(adds/factor, int(bool(adds))) + minuses = '-' * max(removes/factor, int(bool(removes))) + output.append(' %-*s | %*.d %s%s\n' % (maxname, filename, countwidth, + adds+removes, pluses, minuses)) + + if stats: + output.append(' %d files changed, %d insertions(+), %d deletions(-)\n' % + (len(stats), totaladds, totalremoves)) + + return ''.join(output)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/pure/base85.py Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,84 @@ +# base85.py: pure python base85 codec +# +# Copyright (C) 2009 Brendan Cully <brendan@kublai.com> +# +# This software may be used and distributed according to the terms of +# the GNU General Public License, incorporated herein by reference. + +import struct + +_b85chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ + "abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~" +_b85dec = {} + +def _mkb85dec(): + for i in range(len(_b85chars)): + _b85dec[_b85chars[i]] = i + +def b85encode(text, pad=False): + """encode text in base85 format""" + l = len(text) + r = l % 4 + if r: + text += '\0' * (4 - r) + longs = len(text) >> 2 + out = [] + words = struct.unpack('>%dL' % (longs), text) + for word in words: + # unrolling improved speed by 33% + word, r = divmod(word, 85) + e = _b85chars[r] + word, r = divmod(word, 85) + d = _b85chars[r] + word, r = divmod(word, 85) + c = _b85chars[r] + word, r = divmod(word, 85) + b = _b85chars[r] + word, r = divmod(word, 85) + a = _b85chars[r] + + out += (a, b, c, d, e) + + out = ''.join(out) + if pad: + return out + + # Trim padding + olen = l % 4 + if olen: + olen += 1 + olen += l / 4 * 5 + return out[:olen] + +def b85decode(text): + """decode base85-encoded text""" + if not _b85dec: + _mkb85dec() + + l = len(text) + out = [] + for i in range(0, len(text), 5): + chunk = text[i:i+5] + acc = 0 + for j in range(len(chunk)): + try: + acc = acc * 85 + _b85dec[chunk[j]] + except KeyError: + raise TypeError('Bad base85 character at byte %d' % (i + j)) + if acc > 4294967295: + raise OverflowError('Base85 overflow in hunk starting at byte %d' % i) + out.append(acc) + + # Pad final chunk if necessary + cl = l % 5 + if cl: + acc *= 85 ** (5 - cl) + if cl > 1: + acc += 0xffffff >> (cl - 2) * 8 + out[-1] = acc + + out = struct.pack('>%dL' % (len(out)), *out) + if cl: + out = out[:-(5 - cl)] + + return out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/pure/bdiff.py Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,69 @@ +# bdiff.py - Python implementation of bdiff.c +# +# Copyright 2009 Matt Mackall <mpm@selenic.com> and others +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +import struct, difflib +# mdiff import moved to bottom due to import cycle + +def _normalizeblocks(a, b, blocks): + prev = None + for curr in blocks: + if prev is None: + prev = curr + continue + shift = 0 + + a1, b1, l1 = prev + a1end = a1 + l1 + b1end = b1 + l1 + + a2, b2, l2 = curr + a2end = a2 + l2 + b2end = b2 + l2 + if a1end == a2: + while a1end+shift < a2end and a[a1end+shift] == b[b1end+shift]: + shift += 1 + elif b1end == b2: + while b1end+shift < b2end and a[a1end+shift] == b[b1end+shift]: + shift += 1 + yield a1, b1, l1+shift + prev = a2+shift, b2+shift, l2-shift + yield prev + +def bdiff(a, b): + a = str(a).splitlines(True) + b = str(b).splitlines(True) + + if not a: + s = "".join(b) + return s and (struct.pack(">lll", 0, 0, len(s)) + s) + + bin = [] + p = [0] + for i in a: p.append(p[-1] + len(i)) + + d = difflib.SequenceMatcher(None, a, b).get_matching_blocks() + d = _normalizeblocks(a, b, d) + la = 0 + lb = 0 + for am, bm, size in d: + s = "".join(b[lb:bm]) + if am > la or s: + bin.append(struct.pack(">lll", p[la], p[am], len(s)) + s) + la = am + size + lb = bm + size + + return "".join(bin) + +def blocks(a, b): + an = mdiff.splitnewlines(a) + bn = mdiff.splitnewlines(b) + d = difflib.SequenceMatcher(None, an, bn).get_matching_blocks() + d = _normalizeblocks(an, bn, d) + return [(i, i + n, j, j + n) for (i, j, n) in d] + +# this breaks an import cycle +import mdiff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/pure/diffhelpers.py Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,56 @@ +# diffhelpers.py - pure Python implementation of diffhelpers.c +# +# Copyright 2009 Matt Mackall <mpm@selenic.com> and others +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +def addlines(fp, hunk, lena, lenb, a, b): + while True: + todoa = lena - len(a) + todob = lenb - len(b) + num = max(todoa, todob) + if num == 0: + break + for i in xrange(num): + s = fp.readline() + c = s[0] + if s == "\\ No newline at end of file\n": + fix_newline(hunk, a, b) + continue + if c == "\n": + # Some patches may be missing the control char + # on empty lines. Supply a leading space. + s = " \n" + hunk.append(s) + if c == "+": + b.append(s[1:]) + elif c == "-": + a.append(s) + else: + b.append(s[1:]) + a.append(s) + return 0 + +def fix_newline(hunk, a, b): + l = hunk[-1] + c = l[0] + hline = l[:-1] + + if c == " " or c == "+": + b[-1] = l[1:-1] + if c == " " or c == "-": + a[-1] = hline + hunk[-1] = hline + return 0 + + +def testhunk(a, b, bstart): + alen = len(a) + blen = len(b) + if alen > blen - bstart: + return -1 + for i in xrange(alen): + if a[i][1:] != b[i + bstart]: + return -1 + return 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/pure/mpatch.py Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,116 @@ +# mpatch.py - Python implementation of mpatch.c +# +# Copyright 2009 Matt Mackall <mpm@selenic.com> and others +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +import struct +try: + from cStringIO import StringIO +except ImportError: + from StringIO import StringIO + +# This attempts to apply a series of patches in time proportional to +# the total size of the patches, rather than patches * len(text). This +# means rather than shuffling strings around, we shuffle around +# pointers to fragments with fragment lists. +# +# When the fragment lists get too long, we collapse them. To do this +# efficiently, we do all our operations inside a buffer created by +# mmap and simply use memmove. This avoids creating a bunch of large +# temporary string buffers. + +def patches(a, bins): + if not bins: return a + + plens = [len(x) for x in bins] + pl = sum(plens) + bl = len(a) + pl + tl = bl + bl + pl # enough for the patches and two working texts + b1, b2 = 0, bl + + if not tl: return a + + m = StringIO() + def move(dest, src, count): + """move count bytes from src to dest + + The file pointer is left at the end of dest. + """ + m.seek(src) + buf = m.read(count) + m.seek(dest) + m.write(buf) + + # load our original text + m.write(a) + frags = [(len(a), b1)] + + # copy all the patches into our segment so we can memmove from them + pos = b2 + bl + m.seek(pos) + for p in bins: m.write(p) + + def pull(dst, src, l): # pull l bytes from src + while l: + f = src.pop(0) + if f[0] > l: # do we need to split? + src.insert(0, (f[0] - l, f[1] + l)) + dst.append((l, f[1])) + return + dst.append(f) + l -= f[0] + + def collect(buf, list): + start = buf + for l, p in list: + move(buf, p, l) + buf += l + return (buf - start, start) + + for plen in plens: + # if our list gets too long, execute it + if len(frags) > 128: + b2, b1 = b1, b2 + frags = [collect(b1, frags)] + + new = [] + end = pos + plen + last = 0 + while pos < end: + m.seek(pos) + p1, p2, l = struct.unpack(">lll", m.read(12)) + pull(new, frags, p1 - last) # what didn't change + pull([], frags, p2 - p1) # what got deleted + new.append((l, pos + 12)) # what got added + pos += l + 12 + last = p2 + frags = new + frags # what was left at the end + + t = collect(b2, frags) + + m.seek(t[1]) + return m.read(t[0]) + +def patchedsize(orig, delta): + outlen, last, bin = 0, 0, 0 + binend = len(delta) + data = 12 + + while data <= binend: + decode = delta[bin:bin + 12] + start, end, length = struct.unpack(">lll", decode) + if start > end: + break + bin = data + length + data = bin + 12 + outlen += start - last + last = end + outlen += length + + if bin != binend: + raise Exception("patch cannot be decoded") + + outlen += orig - last + return outlen
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/pure/osutil.py Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,42 @@ +import os +import stat as _stat + +def _mode_to_kind(mode): + if _stat.S_ISREG(mode): return _stat.S_IFREG + if _stat.S_ISDIR(mode): return _stat.S_IFDIR + if _stat.S_ISLNK(mode): return _stat.S_IFLNK + if _stat.S_ISBLK(mode): return _stat.S_IFBLK + if _stat.S_ISCHR(mode): return _stat.S_IFCHR + if _stat.S_ISFIFO(mode): return _stat.S_IFIFO + if _stat.S_ISSOCK(mode): return _stat.S_IFSOCK + return mode + +def listdir(path, stat=False, skip=None): + '''listdir(path, stat=False) -> list_of_tuples + + Return a sorted list containing information about the entries + in the directory. + + If stat is True, each element is a 3-tuple: + + (name, type, stat object) + + Otherwise, each element is a 2-tuple: + + (name, type) + ''' + result = [] + prefix = path + if not prefix.endswith(os.sep): + prefix += os.sep + names = os.listdir(path) + names.sort() + for fn in names: + st = os.lstat(prefix + fn) + if fn == skip and _stat.S_ISDIR(st.st_mode): + return [] + if stat: + result.append((fn, _mode_to_kind(st.st_mode), st)) + else: + result.append((fn, _mode_to_kind(st.st_mode))) + return result
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/pure/parsers.py Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,81 @@ +# parsers.py - Python implementation of parsers.c +# +# Copyright 2009 Matt Mackall <mpm@selenic.com> and others +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +from node import bin, hex, nullid, nullrev +import revlog, dirstate, struct, util, zlib + +_pack = struct.pack +_unpack = struct.unpack +_compress = zlib.compress +_decompress = zlib.decompress +_sha = util.sha1 + +def parse_manifest(mfdict, fdict, lines): + for l in lines.splitlines(): + f, n = l.split('\0') + if len(n) > 40: + fdict[f] = n[40:] + mfdict[f] = bin(n[:40]) + else: + mfdict[f] = bin(n) + +def parse_index(data, inline): + indexformatng = revlog.indexformatng + s = struct.calcsize(indexformatng) + index = [] + cache = None + nodemap = {nullid: nullrev} + n = off = 0 + # if we're not using lazymap, always read the whole index + l = len(data) - s + append = index.append + if inline: + cache = (0, data) + while off <= l: + e = _unpack(indexformatng, data[off:off + s]) + nodemap[e[7]] = n + append(e) + n += 1 + if e[1] < 0: + break + off += e[1] + s + else: + while off <= l: + e = _unpack(indexformatng, data[off:off + s]) + nodemap[e[7]] = n + append(e) + n += 1 + off += s + + e = list(index[0]) + type = revlog.gettype(e[0]) + e[0] = revlog.offset_type(0, type) + index[0] = tuple(e) + + # add the magic null revision at -1 + index.append((0, 0, 0, -1, -1, -1, -1, nullid)) + + return index, nodemap, cache + +def parse_dirstate(dmap, copymap, st): + parents = [st[:20], st[20: 40]] + # deref fields so they will be local in loop + e_size = struct.calcsize(dirstate._format) + pos1 = 40 + l = len(st) + + # the inner loop + while pos1 < l: + pos2 = pos1 + e_size + e = _unpack(">cllll", st[pos1:pos2]) # a literal here is faster + pos1 = pos2 + e[4] + f = st[pos2:pos1] + if '\0' in f: + f, c = f.split('\0') + copymap[f] = c + dmap[f] = e[:4] + return parents
--- a/mercurial/repo.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/repo.py Fri Feb 27 08:13:42 2009 -0600 @@ -8,12 +8,6 @@ from i18n import _ -class RepoError(Exception): - pass - -class NoCapability(RepoError): - pass - class repository(object): def capable(self, name): '''tell whether repo supports named capability. @@ -31,9 +25,9 @@ def requirecap(self, name, purpose): '''raise an exception if the given capability is not present''' if not self.capable(name): - raise NoCapability(_('cannot %s; remote repository does not ' - 'support the %r capability') % - (purpose, name)) + raise error.CapabilityError( + _('cannot %s; remote repository does not ' + 'support the %r capability') % (purpose, name)) def local(self): return False
--- a/mercurial/revlog.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/revlog.py Fri Feb 27 08:13:42 2009 -0600 @@ -13,7 +13,7 @@ from node import bin, hex, nullid, nullrev, short from i18n import _ import changegroup, errno, ancestor, mdiff, parsers -import struct, util, zlib +import struct, util, zlib, error _pack = struct.pack _unpack = struct.unpack @@ -29,18 +29,8 @@ REVLOG_DEFAULT_FORMAT = REVLOGNG REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS -class RevlogError(Exception): - pass - -class LookupError(RevlogError, KeyError): - def __init__(self, name, index, message): - self.name = name - if isinstance(name, str) and len(name) == 20: - name = short(name) - RevlogError.__init__(self, _('%s@%s: %s') % (index, name, message)) - - def __str__(self): - return RevlogError.__str__(self) +RevlogError = error.RevlogError +LookupError = error.LookupError def getoffset(q): return int(q >> 16)
--- a/mercurial/sshrepo.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/sshrepo.py Fri Feb 27 08:13:42 2009 -0600 @@ -7,7 +7,7 @@ from node import bin, hex from i18n import _ -import repo, os, re, util +import repo, os, re, util, error class remotelock(object): def __init__(self, repo): @@ -26,7 +26,7 @@ m = re.match(r'^ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?$', path) if not m: - self.raise_(repo.RepoError(_("couldn't parse location %s") % path)) + self.abort(error.RepoError(_("couldn't parse location %s") % path)) self.user = m.group(2) self.host = m.group(3) @@ -45,7 +45,7 @@ ui.note(_('running %s\n') % cmd) res = util.system(cmd) if res != 0: - self.raise_(repo.RepoError(_("could not create remote repo"))) + self.abort(error.RepoError(_("could not create remote repo"))) self.validate_repo(ui, sshcmd, args, remotecmd) @@ -78,7 +78,7 @@ lines.append(l) max_noise -= 1 else: - self.raise_(repo.RepoError(_("no suitable response from remote hg"))) + self.abort(error.RepoError(_("no suitable response from remote hg"))) self.capabilities = util.set() lines.reverse() @@ -95,7 +95,7 @@ if not l: break self.ui.status(_("remote: "), l) - def raise_(self, exception): + def abort(self, exception): self.cleanup() raise exception @@ -115,7 +115,7 @@ def do_cmd(self, cmd, **args): self.ui.debug(_("sending %s command\n") % cmd) self.pipeo.write("%s\n" % cmd) - for k, v in args.items(): + for k, v in args.iteritems(): self.pipeo.write("%s %d\n" % (k, len(v))) self.pipeo.write(v) self.pipeo.flush() @@ -132,7 +132,7 @@ try: l = int(l) except: - self.raise_(util.UnexpectedOutput(_("unexpected response:"), l)) + self.abort(error.ResponseError(_("unexpected response:"), l)) return self.pipei.read(l) def _send(self, data, flush=False): @@ -157,14 +157,14 @@ if int(success): return bin(data) else: - self.raise_(repo.RepoError(data)) + self.abort(error.RepoError(data)) def heads(self): d = self.call("heads") try: return map(bin, d[:-1].split(" ")) except: - self.raise_(util.UnexpectedOutput(_("unexpected response:"), d)) + self.abort(error.ResponseError(_("unexpected response:"), d)) def branches(self, nodes): n = " ".join(map(hex, nodes)) @@ -173,7 +173,7 @@ br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] return br except: - self.raise_(util.UnexpectedOutput(_("unexpected response:"), d)) + self.abort(error.ResponseError(_("unexpected response:"), d)) def between(self, pairs): n = " ".join(["-".join(map(hex, p)) for p in pairs]) @@ -182,7 +182,7 @@ p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] return p except: - self.raise_(util.UnexpectedOutput(_("unexpected response:"), d)) + self.abort(error.ResponseError(_("unexpected response:"), d)) def changegroup(self, nodes, kind): n = " ".join(map(hex, nodes)) @@ -198,7 +198,7 @@ d = self.call("unbundle", heads=' '.join(map(hex, heads))) if d: # remote may send "unsynced changes" - self.raise_(repo.RepoError(_("push refused: %s") % d)) + self.abort(error.RepoError(_("push refused: %s") % d)) while 1: d = cg.read(4096) @@ -211,18 +211,18 @@ r = self._recv() if r: # remote may send "unsynced changes" - self.raise_(repo.RepoError(_("push failed: %s") % r)) + self.abort(error.RepoError(_("push failed: %s") % r)) r = self._recv() try: return int(r) except: - self.raise_(util.UnexpectedOutput(_("unexpected response:"), r)) + self.abort(error.ResponseError(_("unexpected response:"), r)) def addchangegroup(self, cg, source, url): d = self.call("addchangegroup") if d: - self.raise_(repo.RepoError(_("push refused: %s") % d)) + self.abort(error.RepoError(_("push refused: %s") % d)) while 1: d = cg.read(4096) if not d: @@ -239,7 +239,7 @@ try: return int(r) except: - self.raise_(util.UnexpectedOutput(_("unexpected response:"), r)) + self.abort(error.ResponseError(_("unexpected response:"), r)) def stream_out(self): return self.do_cmd('stream_out')
--- a/mercurial/statichttprepo.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/statichttprepo.py Fri Feb 27 08:13:42 2009 -0600 @@ -8,7 +8,7 @@ # of the GNU General Public License, incorporated herein by reference. from i18n import _ -import changelog, byterange, url +import changelog, byterange, url, error import repo, localrepo, manifest, util, store import urllib, urllib2, errno @@ -79,13 +79,13 @@ raise # we do not care about empty old-style repositories here msg = _("'%s' does not appear to be an hg repository") % path - raise repo.RepoError(msg) + raise error.RepoError(msg) requirements = [] # check them for r in requirements: if r not in self.supported: - raise repo.RepoError(_("requirement '%s' not supported") % r) + raise error.RepoError(_("requirement '%s' not supported") % r) # setup store def pjoin(a, b):
--- a/mercurial/streamclone.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/streamclone.py Fri Feb 27 08:13:42 2009 -0600 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -import util, lock +import util, error from i18n import _ class StreamException(Exception): @@ -51,7 +51,7 @@ total_bytes += size finally: del l - except (lock.LockHeld, lock.LockUnavailable): + except error.LockError: raise StreamException(2) yield '0\n'
--- a/mercurial/templatefilters.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/templatefilters.py Fri Feb 27 08:13:42 2009 -0600 @@ -30,8 +30,10 @@ now = time.time() then = date[0] + if then > now: + return 'in the future' + delta = max(1, int(now - then)) - for t, s in agescales: n = delta / s if n >= 2 or s == 1:
--- a/mercurial/ui.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/ui.py Fri Feb 27 08:13:42 2009 -0600 @@ -340,7 +340,7 @@ if user is None: user = os.environ.get("EMAIL") if user is None and self.configbool("ui", "askusername"): - user = self.prompt(_("Enter a commit username:"), default=None) + user = self.prompt(_("enter a commit username:"), default=None) if user is None: try: user = '%s@%s' % (util.getuser(), socket.getfqdn()) @@ -350,7 +350,7 @@ if not user: raise util.Abort(_("Please specify a username.")) if "\n" in user: - raise util.Abort(_("username %s contains a newline\n") % `user`) + raise util.Abort(_("username %s contains a newline\n") % repr(user)) return user def shortuser(self, user): @@ -439,7 +439,10 @@ def getpass(self, prompt=None, default=None): if not self.interactive: return default - return getpass.getpass(prompt or _('password: ')) + try: + return getpass.getpass(prompt or _('password: ')) + except EOFError: + raise util.Abort(_('response expected')) def status(self, *msg): if not self.quiet: self.write(*msg) def warn(self, *msg):
--- a/mercurial/util.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/util.py Fri Feb 27 08:13:42 2009 -0600 @@ -13,9 +13,9 @@ """ from i18n import _ -import cStringIO, errno, getpass, re, shutil, sys, tempfile, traceback +import cStringIO, errno, getpass, re, shutil, sys, tempfile, traceback, error import os, stat, threading, time, calendar, ConfigParser, locale, glob, osutil -import imp +import imp, unicodedata # Python compatibility @@ -138,9 +138,21 @@ except LookupError, k: raise Abort(_("%s, please check your locale settings") % k) -def locallen(s): - """Find the length in characters of a local string""" - return len(s.decode(_encoding, "replace")) +def colwidth(s): + "Find the column width of a UTF-8 string for display" + d = s.decode(_encoding, 'replace') + if hasattr(unicodedata, 'east_asian_width'): + w = unicodedata.east_asian_width + return sum([w(c) in 'WF' and 2 or 1 for c in d]) + return len(d) + +def version(): + """Return version information if available.""" + try: + import __version__ + return __version__.version + except ImportError: + return 'unknown' # used by parsedate defaultdateformats = ( @@ -177,9 +189,6 @@ "%b %Y", ) -class SignalInterrupt(Exception): - """Exception raised on SIGTERM and SIGHUP.""" - # differences from SafeConfigParser: # - case-sensitive keys # - allows values that are not strings (this means that you may not @@ -327,9 +336,6 @@ class Abort(Exception): """Raised if a command needs to print an error and exit.""" -class UnexpectedOutput(Abort): - """Raised to print an error with part of output and exit.""" - def always(fn): return True def never(fn): return False @@ -647,7 +653,7 @@ elif main_is_frozen(): set_hgexecutable(sys.executable) else: - set_hgexecutable(find_exe('hg', 'hg')) + set_hgexecutable(find_exe('hg') or 'hg') return _hgexecutable def set_hgexecutable(path): @@ -705,9 +711,6 @@ if cwd is not None and oldcwd != cwd: os.chdir(oldcwd) -class SignatureError: - pass - def checksignature(func): '''wrap a function with code to check for calling errors''' def check(*args, **kwargs): @@ -715,7 +718,7 @@ return func(*args, **kwargs) except TypeError: if len(traceback.extract_tb(sys.exc_info()[2])) == 1: - raise SignatureError + raise error.SignatureError raise return check @@ -737,12 +740,10 @@ # on windows, rename to existing file is not allowed, so we # must delete destination first. but if file is open, unlink # schedules it for delete but does not delete it. rename - # happens immediately even for open files, so we create - # temporary file, delete it, rename destination to that name, - # then delete that. then rename is safe to do. - fd, temp = tempfile.mkstemp(dir=os.path.dirname(dst) or '.') - os.close(fd) - os.unlink(temp) + # happens immediately even for open files, so we rename + # destination to a temporary name, then delete that. then + # rename is safe to do. + temp = dst + "-force-rename" os.rename(dst, temp) os.unlink(temp) os.rename(src, dst) @@ -757,7 +758,7 @@ pass def copyfile(src, dest): - "copy a file, preserving mode" + "copy a file, preserving mode and atime/mtime" if os.path.islink(src): try: os.unlink(dest) @@ -767,7 +768,7 @@ else: try: shutil.copyfile(src, dest) - shutil.copymode(src, dest) + shutil.copystat(src, dest) except shutil.Error, inst: raise Abort(str(inst)) @@ -814,13 +815,15 @@ return normpath = os.path.normcase(path) parts = splitpath(normpath) - if (os.path.splitdrive(path)[0] or parts[0] in ('.hg', '.hg.', '') + if (os.path.splitdrive(path)[0] + or parts[0].lower() in ('.hg', '.hg.', '') or os.pardir in parts): raise Abort(_("path contains illegal component: %s") % path) - if '.hg' in path: + if '.hg' in path.lower(): + lparts = [p.lower() for p in parts] for p in '.hg', '.hg.': - if p in parts[1:-1]: - pos = parts.index(p) + if p in lparts[1:-1]: + pos = lparts.index(p) base = os.path.join(*parts[:pos]) raise Abort(_('path %r is inside repo %r') % (path, base)) def check(prefix): @@ -1267,29 +1270,33 @@ def isowner(fp, st=None): return True - def find_in_path(name, path, default=None): - '''find name in search path. path can be string (will be split - with os.pathsep), or iterable thing that returns strings. if name - found, return path to name. else return default. name is looked up - using cmd.exe rules, using PATHEXT.''' - if isinstance(path, str): - path = path.split(os.pathsep) - + def find_exe(command): + '''Find executable for command searching like cmd.exe does. + If command is a basename then PATH is searched for command. + PATH isn't searched if command is an absolute or relative path. + An extension from PATHEXT is found and added if not present. + If command isn't found None is returned.''' pathext = os.environ.get('PATHEXT', '.COM;.EXE;.BAT;.CMD') - pathext = pathext.lower().split(os.pathsep) - isexec = os.path.splitext(name)[1].lower() in pathext + pathexts = [ext for ext in pathext.lower().split(os.pathsep)] + if os.path.splitext(command)[1].lower() in pathexts: + pathexts = [''] + + def findexisting(pathcommand): + 'Will append extension (if needed) and return existing file' + for ext in pathexts: + executable = pathcommand + ext + if os.path.exists(executable): + return executable + return None - for p in path: - p_name = os.path.join(p, name) - - if isexec and os.path.exists(p_name): - return p_name - - for ext in pathext: - p_name_ext = p_name + ext - if os.path.exists(p_name_ext): - return p_name_ext - return default + if os.sep in command: + return findexisting(command) + + for path in os.environ.get('PATH', '').split(os.pathsep): + executable = findexisting(os.path.join(path, command)) + if executable is not None: + return executable + return None def set_signal_handler(): try: @@ -1455,33 +1462,32 @@ st = fstat(fp) return st.st_uid == os.getuid() - def find_in_path(name, path, default=None): - '''find name in search path. path can be string (will be split - with os.pathsep), or iterable thing that returns strings. if name - found, return path to name. else return default.''' - if isinstance(path, str): - path = path.split(os.pathsep) - for p in path: - p_name = os.path.join(p, name) - if os.path.exists(p_name): - return p_name - return default + def find_exe(command): + '''Find executable for command searching like which does. + If command is a basename then PATH is searched for command. + PATH isn't searched if command is an absolute or relative path. + If command isn't found None is returned.''' + if sys.platform == 'OpenVMS': + return command + + def findexisting(executable): + 'Will return executable if existing file' + if os.path.exists(executable): + return executable + return None + + if os.sep in command: + return findexisting(command) + + for path in os.environ.get('PATH', '').split(os.pathsep): + executable = findexisting(os.path.join(path, command)) + if executable is not None: + return executable + return None def set_signal_handler(): pass -def find_exe(name, default=None): - '''find path of an executable. - if name contains a path component, return it as is. otherwise, - use normal executable search path.''' - - if os.sep in name or sys.platform == 'OpenVMS': - # don't check the executable bit. if the file isn't - # executable, whoever tries to actually run it will give a - # much more useful error message. - return name - return find_in_path(name, os.environ.get('PATH', ''), default=default) - def mktempcopy(name, emptyok=False, createmode=None): """Create a temporary file with the same contents from name @@ -1991,3 +1997,24 @@ def uirepr(s): # Avoid double backslash in Windows path repr() return repr(s).replace('\\\\', '\\') + +def termwidth(): + if 'COLUMNS' in os.environ: + try: + return int(os.environ['COLUMNS']) + except ValueError: + pass + try: + import termios, array, fcntl + for dev in (sys.stdout, sys.stdin): + try: + fd = dev.fileno() + if not os.isatty(fd): + continue + arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) + return array.array('h', arri)[1] + except ValueError: + pass + except ImportError: + pass + return 80
--- a/mercurial/util_win32.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/util_win32.py Fri Feb 27 08:13:42 2009 -0600 @@ -19,7 +19,7 @@ import util from win32com.shell import shell,shellcon -class WinError: +class WinError(Exception): winerror_map = { winerror.ERROR_ACCESS_DENIED: errno.EACCES, winerror.ERROR_ACCOUNT_DISABLED: errno.EACCES, @@ -161,6 +161,8 @@ 'move the file to a different disk drive')) except pywintypes.error, details: raise WinOSError(details) + except NotImplementedError: # Another fake error win Win98 + raise WinOSError((18, 'CreateHardLink', 'Hardlinking not supported')) def nlinks(pathname): """Return number of hardlinks for the given file."""
--- a/mercurial/verify.py Sun Jan 25 19:15:49 2009 +0100 +++ b/mercurial/verify.py Fri Feb 27 08:13:42 2009 -0600 @@ -220,7 +220,7 @@ # cross-check if f in filenodes: - fns = [(mf.linkrev(l), n) for n,l in filenodes[f].items()] + fns = [(mf.linkrev(l), n) for n,l in filenodes[f].iteritems()] for lr, node in util.sort(fns): err(lr, _("%s in manifests not found") % short(node), f)
--- a/mercurial/version.py Sun Jan 25 19:15:49 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -# Copyright (C) 2005, 2006, 2008 by Intevation GmbH -# Author(s): -# Thomas Arendsen Hein <thomas@intevation.de> -# -# This program is free software under the GNU GPL (>=v2) -# Read the file COPYING coming with the software for details. - -""" -Mercurial version -""" - -import os -import re -import time - -unknown_version = 'unknown' -remembered_version = False - -def get_version(doreload=False): - """Return version information if available.""" - try: - import mercurial.__version__ - if doreload: - reload(mercurial.__version__) - version = mercurial.__version__.version - except ImportError: - version = unknown_version - return version - -def write_version(version): - """Overwrite version file.""" - if version == get_version(): - return - directory = os.path.dirname(__file__) - for suffix in ['py', 'pyc', 'pyo']: - try: - os.unlink(os.path.join(directory, '__version__.%s' % suffix)) - except OSError: - pass - f = open(os.path.join(directory, '__version__.py'), 'w') - f.write("# This file is auto-generated.\n") - f.write("version = %r\n" % version) - f.close() - # reload the file we've just written - get_version(True) - -def remember_version(version=None): - """Store version information.""" - global remembered_version - if not version and os.path.isdir(".hg"): - f = os.popen("hg identify") # use real hg installation - ident = f.read()[:-1] - if not f.close() and ident: - ids = ident.split(' ', 1) - version = ids.pop(0) - if version[-1] == '+': - version = version[:-1] - modified = True - else: - modified = False - if version.isalnum() and ids: - for tag in ids[0].split('/'): - # is a tag is suitable as a version number? - if re.match(r'^(\d+\.)+[\w.-]+$', tag): - version = tag - break - if modified: - version += time.strftime('+%Y%m%d') - if version: - remembered_version = True - write_version(version) - -def forget_version(): - """Remove version information.""" - if remembered_version: - write_version(unknown_version) -
--- a/setup.py Sun Jan 25 19:15:49 2009 +0100 +++ b/setup.py Fri Feb 27 08:13:42 2009 -0600 @@ -9,15 +9,34 @@ if not hasattr(sys, 'version_info') or sys.version_info < (2, 3, 0, 'final'): raise SystemExit("Mercurial requires python 2.3 or later.") -import os +# Solaris Python packaging brain damage +try: + import hashlib + sha = hashlib.sha1() +except: + try: + import sha + except: + raise SystemExit( + "Couldn't import standard hashlib (incomplete Python install).") + +try: + import zlib +except: + raise SystemExit( + "Couldn't import standard zlib (incomplete Python install).") + +import os, time import shutil import tempfile from distutils.core import setup, Extension +from distutils.dist import Distribution from distutils.command.install_data import install_data +from distutils.command.build import build +from distutils.command.build_py import build_py +from distutils.spawn import spawn, find_executable from distutils.ccompiler import new_compiler -import mercurial.version - extra = {} scripts = ['hg'] if os.name == 'nt': @@ -78,8 +97,30 @@ except ImportError: pass -# specify version string, otherwise 'hg identify' will be used: -version = '' +try: + # execute hg out of this directory with a custom environment which + # includes the pure Python modules in mercurial/pure + pypath = os.environ.get('PYTHONPATH', '') + purepath = os.path.join('mercurial', 'pure') + os.environ['PYTHONPATH'] = os.pathsep.join(['mercurial', purepath, pypath]) + os.environ['HGRCPATH'] = '' # do not read any config file + cmd = '%s hg id -it' % sys.executable + l = os.popen(cmd).read().split() + os.environ['PYTHONPATH'] = pypath + while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags + l.pop() + version = l and l[-1] or 'unknown' # latest tag or revision number + if version.endswith('+'): + version += time.strftime('%Y%m%d') + +except OSError, e: + print "warning: could not establish Mercurial version: %s" % e + version = "unknown" + +f = file("mercurial/__version__.py", "w") +f.write('# this file is autogenerated by setup.py\n') +f.write('version = "%s"\n' % version) +f.close() class install_package_data(install_data): def finalize_options(self): @@ -87,8 +128,68 @@ ('install_lib', 'install_dir')) install_data.finalize_options(self) -mercurial.version.remember_version(version) -cmdclass = {'install_data': install_package_data} +class build_mo(build): + + description = "build translations (.mo files)" + + def run(self): + if not find_executable('msgfmt'): + self.warn("could not find msgfmt executable, no translations " + "will be built") + return + + podir = 'i18n' + if not os.path.isdir(podir): + self.warn("could not find %s/ directory" % podir) + return + + join = os.path.join + for po in os.listdir(podir): + if not po.endswith('.po'): + continue + pofile = join(podir, po) + modir = join('locale', po[:-3], 'LC_MESSAGES') + mofile = join(modir, 'hg.mo') + cmd = ['msgfmt', '-v', '-o', mofile, pofile] + if sys.platform != 'sunos5': + # msgfmt on Solaris does not know about -c + cmd.append('-c') + self.mkpath(modir) + self.make_file([pofile], mofile, spawn, (cmd,)) + self.distribution.data_files.append((join('mercurial', modir), + [mofile])) + +build.sub_commands.append(('build_mo', None)) + +Distribution.pure = 0 +Distribution.global_options.append(('pure', None, "use pure (slow) Python " + "code instead of C extensions")) + +class hg_build_py(build_py): + + def finalize_options(self): + build_py.finalize_options(self) + + if self.distribution.pure: + if self.py_modules is None: + self.py_modules = [] + for ext in self.distribution.ext_modules: + if ext.name.startswith("mercurial."): + self.py_modules.append("mercurial.pure.%s" % ext.name[10:]) + self.distribution.ext_modules = [] + + def find_modules(self): + modules = build_py.find_modules(self) + for module in modules: + if module[0] == "mercurial.pure": + if module[1] != "__init__": + yield ("mercurial", module[1], module[2]) + else: + yield module + +cmdclass = {'install_data': install_package_data, + 'build_mo': build_mo, + 'build_py': hg_build_py} ext_modules=[ Extension('mercurial.base85', ['mercurial/base85.c']), @@ -122,8 +223,14 @@ except ImportError: pass +datafiles = [] +for root in ('templates', 'i18n'): + for dir, dirs, files in os.walk(root): + datafiles.append((os.path.join('mercurial', dir), + [os.path.join(dir, file_) for file_ in files])) + setup(name='mercurial', - version=mercurial.version.get_version(), + version=version, author='Matt Mackall', author_email='mpm@selenic.com', url='http://selenic.com/mercurial', @@ -132,9 +239,7 @@ scripts=scripts, packages=packages, ext_modules=ext_modules, - data_files=[(os.path.join('mercurial', root), - [os.path.join(root, file_) for file_ in files]) - for root, dirs, files in os.walk('templates')], + data_files=datafiles, cmdclass=cmdclass, options=dict(py2exe=dict(packages=['hgext', 'email']), bdist_mpkg=dict(zipdist=True,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/atom/error.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,17 @@ +{header} + <!-- Error --> + <id>{urlbase}{url}</id> + <link rel="self" href="{urlbase}{url}atom-log"/> + <link rel="alternate" href="{urlbase}{url}"/> + <title>Error</title> + <updated>1970-01-01T00:00:00+00:00</updated> + <entry> + <title>Error</title> + <id>http://www.selenic.com/mercurial/#error</id> + <author> + <name>mercurial</name> + </author> + <updated>1970-01-01T00:00:00+00:00</updated> + <content type="text">{error|escape}</content> + </entry> +</feed>
--- a/templates/atom/map Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/atom/map Fri Feb 27 08:13:42 2009 -0600 @@ -8,3 +8,4 @@ filelogentry = filelogentry.tmpl tags = tags.tmpl tagentry = tagentry.tmpl +error = error.tmpl
--- a/templates/coal/header.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/coal/header.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -1,7 +1,6 @@ -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="{staticurl}hgicon.png" type="image/png"> +<link rel="icon" href="{staticurl}hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="{staticurl}style-coal.css" type="text/css" />
--- a/templates/paper/changeset.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/changeset.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -6,7 +6,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -30,9 +30,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">{desc|strip|escape|addbreaks}</div>
--- a/templates/paper/error.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/error.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -24,8 +24,8 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} <p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">
--- a/templates/paper/fileannotate.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/fileannotate.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -34,9 +34,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">{desc|strip|escape|addbreaks}</div>
--- a/templates/paper/filediff.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/filediff.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -32,10 +32,10 @@ <h3>diff {file|escape} @ {rev}:{node|short}</h3> <form class="search" action="{url}log"> -{sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p>{sessionvars%hiddenformentry}</p> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">{desc|strip|escape|addbreaks}</div>
--- a/templates/paper/filelog.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/filelog.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -1,9 +1,9 @@ {header} <title>{repo|escape}: {file|escape} history</title> <link rel="alternate" type="application/atom+xml" - href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}"> + href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}" /> <link rel="alternate" type="application/rss+xml" - href="{url}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}"> + href="{url}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}" /> </head> <body> @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -37,9 +37,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate">{nav%filenaventry}</div>
--- a/templates/paper/filerevision.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/filerevision.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -33,9 +33,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">{desc|strip|escape|addbreaks}</div>
--- a/templates/paper/graph.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/graph.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -1,9 +1,9 @@ {header} <title>{repo|escape}: revision graph</title> <link rel="alternate" type="application/atom+xml" - href="{url}atom-log" title="Atom feed for {repo|escape}: log"> + href="{url}atom-log" title="Atom feed for {repo|escape}: log" /> <link rel="alternate" type="application/rss+xml" - href="{url}rss-log" title="RSS feed for {repo|escape}: log"> + href="{url}rss-log" title="RSS feed for {repo|escape}: log" /> <!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]--> </head> <body> @@ -12,7 +12,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -31,9 +31,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate"> @@ -42,7 +42,7 @@ | rev {rev}: {changenav%navgraphentry} </div> -<noscript>The revision graph only works with JavaScript-enabled browsers.</noscript> +<noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript> <div id="wrapper"> <ul id="nodebgs"></ul>
--- a/templates/paper/header.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/header.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -1,7 +1,6 @@ -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="{staticurl}hgicon.png" type="image/png"> +<link rel="icon" href="{staticurl}hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="{staticurl}style-paper.css" type="text/css" />
--- a/templates/paper/manifest.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/manifest.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -29,9 +29,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <table class="bigtable">
--- a/templates/paper/map Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/map Fri Feb 27 08:13:42 2009 -0600 @@ -23,8 +23,8 @@ changeset = changeset.tmpl manifest = manifest.tmpl -direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a> <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>' -fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png"> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>' +direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png" alt="dir."/> {basename|escape}/</a> <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>' +fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png" alt="file"/> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl
--- a/templates/paper/search.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/search.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -23,8 +23,8 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} <p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <table class="bigtable">
--- a/templates/paper/shortlog.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/shortlog.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -1,9 +1,9 @@ {header} <title>{repo|escape}: log</title> <link rel="alternate" type="application/atom+xml" - href="{url}atom-log" title="Atom feed for {repo|escape}"> + href="{url}atom-log" title="Atom feed for {repo|escape}" /> <link rel="alternate" type="application/rss+xml" - href="{url}rss-log" title="RSS feed for {repo|escape}"> + href="{url}rss-log" title="RSS feed for {repo|escape}" /> </head> <body> @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li class="active">log</li> @@ -33,9 +33,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate">rev {rev}: {changenav%navshortentry}</div>
--- a/templates/paper/tags.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/paper/tags.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -1,9 +1,9 @@ {header} <title>{repo|escape}: tags</title> <link rel="alternate" type="application/atom+xml" - href="{url}atom-tags" title="Atom feed for {repo|escape}: tags"> + href="{url}atom-tags" title="Atom feed for {repo|escape}: tags" /> <link rel="alternate" type="application/rss+xml" - href="{url}rss-tags" title="RSS feed for {repo|escape}: tags"> + href="{url}rss-tags" title="RSS feed for {repo|escape}: tags" /> </head> <body> @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> @@ -26,9 +26,9 @@ <form class="search" action="{url}log"> {sessionvars%hiddenformentry} -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <table class="bigtable">
--- a/templates/rss/changelogentry.tmpl Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/rss/changelogentry.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -1,6 +1,6 @@ <item> <title>#desc|strip|firstline|strip|escape#</title> - <link>{urlbase}{url}rev/{node|short}</link> + <guid isPermaLink="true">{urlbase}{url}rev/{node|short}</guid> <description><![CDATA[#desc|strip|escape|addbreaks#]]></description> <author>#author|obfuscate#</author> <pubDate>#date|rfc822date#</pubDate>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/rss/error.tmpl Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,10 @@ +{header} + <title>Error</title> + <description>Error</description> + <item> + <title>Error</title> + <description>{error|escape}</description> + <guid>http://www.selenic.com/mercurial/#error</guid> + </item> + </channel> +</rss>
--- a/templates/rss/map Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/rss/map Fri Feb 27 08:13:42 2009 -0600 @@ -7,3 +7,4 @@ filelogentry = filelogentry.tmpl tags = tags.tmpl tagentry = tagentry.tmpl +error = error.tmpl
--- a/templates/static/style-coal.css Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/static/style-coal.css Fri Feb 27 08:13:42 2009 -0600 @@ -63,6 +63,12 @@ color: white; } +.menu img { + width: 75px; + height: 90px; + border: 0; +} + .menu a { color: black; display: block; } .search { @@ -71,7 +77,7 @@ right: 2em; } -form.search span { +form.search div#hint { display: none; position: absolute; top: 40px; @@ -85,7 +91,7 @@ -webkit-border-radius: 5px; /* this is just for Safari */ } -form.search:hover span { display: block; } +form.search:hover div#hint { display: block; } a { text-decoration:none; } .age { white-space:nowrap; }
--- a/templates/static/style-paper.css Sun Jan 25 19:15:49 2009 +0100 +++ b/templates/static/style-paper.css Fri Feb 27 08:13:42 2009 -0600 @@ -54,6 +54,12 @@ font-weight: bold; } +.menu img { + width: 75px; + height: 90px; + border: 0; +} + .menu a { color: black; display: block; } .search { @@ -62,7 +68,7 @@ right: 2em; } -form.search span { +form.search div#hint { display: none; position: absolute; top: 40px; @@ -76,7 +82,7 @@ -webkit-border-radius: 5px; /* this is just for Safari */ } -form.search:hover span { display: block; } +form.search:hover div#hint { display: block; } a { text-decoration:none; } .age { white-space:nowrap; }
--- a/tests/hghave Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/hghave Fri Feb 27 08:13:42 2009 -0600 @@ -27,7 +27,7 @@ def has_bzr(): try: import bzrlib - return True + return bzrlib.__doc__ != None except ImportError: return False
--- a/tests/printenv.py Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/printenv.py Fri Feb 27 08:13:42 2009 -0600 @@ -46,6 +46,9 @@ elif url.startswith("remote:http"): os.environ["HG_URL"] = "remote:http" +if "HG_PENDING" in os.environ: + os.environ["HG_PENDING"] = os.environ["HG_PENDING"] and "true" + out.write("%s hook: " % name) for v in env: out.write("%s=%s " % (v, os.environ[v]))
--- a/tests/run-tests.py Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/run-tests.py Fri Feb 27 08:13:42 2009 -0600 @@ -67,6 +67,8 @@ help="skip showing test changes") parser.add_option("--with-hg", type="string", help="test existing install at given location") +parser.add_option("--pure", action="store_true", + help="use pure Python code instead of C extensions") for option, default in defaults.items(): defaults[option] = int(os.environ.get(*default)) @@ -175,13 +177,14 @@ global python vlog("# Performing temporary installation of HG") installerrs = os.path.join("tests", "install.err") + pure = options.pure and "--pure" or "" # Run installer in hg root os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '..')) - cmd = ('%s setup.py clean --all' + cmd = ('%s setup.py %s clean --all' ' install --force --prefix="%s" --install-lib="%s"' ' --install-scripts="%s" >%s 2>&1' - % (sys.executable, INST, PYTHONDIR, BINDIR, installerrs)) + % (sys.executable, pure, INST, PYTHONDIR, BINDIR, installerrs)) vlog("# Running", cmd) if os.system(cmd) == 0: if not verbose: @@ -270,7 +273,7 @@ """Run command in a sub-process, capturing the output (stdout and stderr). Return the exist code, and output.""" # TODO: Use subprocess.Popen if we're running on Python 2.4 - if os.name == 'nt': + if os.name == 'nt' or sys.platform.startswith('java'): tochild, fromchild = os.popen4(cmd) tochild.close() output = fromchild.read() @@ -462,7 +465,8 @@ os.environ['CDPATH'] = '' TESTDIR = os.environ["TESTDIR"] = os.getcwd() -HGTMP = os.environ['HGTMP'] = tempfile.mkdtemp('', 'hgtests.', options.tmpdir) +HGTMP = os.environ['HGTMP'] = os.path.realpath(tempfile.mkdtemp('', 'hgtests.', + options.tmpdir)) DAEMON_PIDS = None HGRCPATH = None @@ -479,7 +483,7 @@ INST = options.with_hg else: INST = os.path.join(HGTMP, "install") -BINDIR = os.path.join(INST, "bin") +BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin") PYTHONDIR = os.path.join(INST, "lib", "python") COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
--- a/tests/test-acl.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-acl.out Fri Feb 27 08:13:42 2009 -0600 @@ -15,7 +15,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -43,7 +43,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -75,7 +75,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -112,7 +112,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -151,7 +151,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -193,7 +193,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -234,7 +234,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -278,7 +278,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -321,7 +321,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -365,7 +365,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -409,7 +409,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -458,7 +458,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -506,7 +506,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 @@ -561,7 +561,7 @@ searching for changes common changesets up to 6675d58eff77 3 changesets found -List of changesets: +list of changesets: ef1ea85a6374b77d6da9dcda9541f498f2d17df7 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955
--- a/tests/test-audit-path Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-audit-path Fri Feb 27 08:13:42 2009 -0600 @@ -41,4 +41,8 @@ hg manifest -r3 hg update -Cr3 +echo % attack /tmp/test +hg manifest -r4 +hg update -Cr4 2>&1 | sed -e "s|/.*/test-audit-path|[HGTMP]/test-audit-path|" + exit 0
--- a/tests/test-audit-path.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-audit-path.out Fri Feb 27 08:13:42 2009 -0600 @@ -10,7 +10,7 @@ adding changesets adding manifests adding file changes -added 4 changesets with 5 changes to 5 files (+3 heads) +added 5 changesets with 6 changes to 6 files (+4 heads) (run 'hg heads' to see heads, 'hg merge' to merge) % attack .hg/test .hg/test @@ -25,3 +25,6 @@ % attack ../test ../test abort: path contains illegal component: ../test +% attack /tmp/test +/tmp/test +abort: No such file or directory: [HGTMP]/test-audit-path/target//tmp/test
--- a/tests/test-bdiff Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-bdiff Fri Feb 27 08:13:42 2009 -0600 @@ -9,13 +9,13 @@ if d: c = mpatch.patches(a, [d]) if c != b: - print "***", `a`, `b` + print "***", repr(a), repr(b) print "bad:" - print `c`[:200] - print `d` + print repr(c)[:200] + print repr(d) def test(a, b): - print "***", `a`, `b` + print "***", repr(a), repr(b) test1(a, b) test1(b, a)
--- a/tests/test-bisect Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-bisect Fri Feb 27 08:13:42 2009 -0600 @@ -72,3 +72,13 @@ echo % test no action hg bisect -r hg bisect || echo failure + +echo % reproduce AssertionError, issue1445 +hg bisect -r +hg bisect -b 6 +hg bisect -g 0 +hg bisect -s +hg bisect -s +hg bisect -s +hg bisect -s +hg bisect -g
--- a/tests/test-bisect.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-bisect.out Fri Feb 27 08:13:42 2009 -0600 @@ -286,3 +286,20 @@ % test no action abort: cannot bisect (no known good revisions) failure +% reproduce AssertionError, issue1445 +Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +The first bad revision is: +changeset: 6:a3d5c6fdf0d3 +user: test +date: Thu Jan 01 00:00:06 1970 +0000 +summary: msg 6 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-bookmarks-current Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,41 @@ +#!/bin/sh + +echo "[extensions]" >> $HGRCPATH +echo "bookmarks=" >> $HGRCPATH + +echo "[bookmarks]" >> $HGRCPATH +echo "track.current = True" >> $HGRCPATH + +hg init + +echo % no bookmarks +hg bookmarks + +echo % set bookmark X +hg bookmark X + +echo % update to bookmark X +hg update X + +echo % list bookmarks +hg bookmarks + +echo % rename +hg bookmark -m X Z + +echo % list bookmarks +hg bookmarks + +echo % new bookmark Y +hg bookmark Y + +echo % list bookmarks +hg bookmark + +echo % commit +echo 'b' > b +hg add b +hg commit -m'test' + +echo % list bookmarks +hg bookmark
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-bookmarks-current.out Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,18 @@ +% no bookmarks +no bookmarks set +% set bookmark X +% update to bookmark X +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +% list bookmarks + * X -1:000000000000 +% rename +% list bookmarks + * Z -1:000000000000 +% new bookmark Y +% list bookmarks + Y -1:000000000000 + * Z -1:000000000000 +% commit +% list bookmarks + Y -1:000000000000 + * Z 0:719295282060
--- a/tests/test-bookmarks-rebase.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-bookmarks-rebase.out Fri Feb 27 08:13:42 2009 -0600 @@ -18,6 +18,8 @@ rebase completed changeset: 3:9163974d1cb5 tag: tip +tag: two +tag: one parent: 1:925d80f479bb parent: 2:db815d6d32e6 user: test
--- a/tests/test-bookmarks.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-bookmarks.out Fri Feb 27 08:13:42 2009 -0600 @@ -7,6 +7,7 @@ * X 0:f7b1eb17ad24 % look up bookmark changeset: 0:f7b1eb17ad24 +tag: X tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -51,7 +52,10 @@ * x y 2:0316ce92851d % look up stripped bookmark name changeset: 2:0316ce92851d +tag: X2 +tag: Y tag: tip +tag: x y user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 2
--- a/tests/test-branches Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-branches Fri Feb 27 08:13:42 2009 -0600 @@ -50,3 +50,30 @@ echo "---- Branch b" hg log -b b + +echo "---- going to test branch closing" +hg branches +hg up -C b +echo 'xxx1' >> b +hg commit -d '7 0' -u test -m 'adding cset to branch b' +hg up -C aee39cd168d0 +echo 'xxx2' >> b +hg commit -d '8 0' -u test -m 'adding head to branch b' +echo 'xxx3' >> b +hg commit -d '9 0' -u test -m 'adding another cset to branch b' +hg branches +hg heads +hg heads -a +hg commit -d '9 0' -u test --close-branch -m 'prune bad branch' +hg branches -a +hg up -C b +hg commit -d '9 0' -u test --close-branch -m 'close this part branch too' +echo '--- b branch should be inactive' +hg branches +hg branches -a +echo 'xxx4' >> b +hg commit -d '9 0' -u test -m 'reopen branch with a change' +echo '--- branch b is back in action' +hg branches -a +hg heads +hg heads -a
--- a/tests/test-branches.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-branches.out Fri Feb 27 08:13:42 2009 -0600 @@ -49,3 +49,102 @@ date: Thu Jan 01 00:00:02 1970 +0000 summary: Adding b branch +---- going to test branch closing +a branch name much longer than the default justification used by branches 7:10ff5895aa57 +b 4:aee39cd168d0 +c 6:589736a22561 (inactive) +a 5:d8cbc61dbaa6 (inactive) +default 0:19709c5a4e75 (inactive) +2 files updated, 0 files merged, 4 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +b 10:bfbe841b666e +a branch name much longer than the default justification used by branches 7:10ff5895aa57 +c 6:589736a22561 (inactive) +a 5:d8cbc61dbaa6 (inactive) +default 0:19709c5a4e75 (inactive) +changeset: 10:bfbe841b666e +branch: b +tag: tip +user: test +date: Thu Jan 01 00:00:09 1970 +0000 +summary: adding another cset to branch b + +changeset: 8:eebb944467c9 +branch: b +parent: 4:aee39cd168d0 +user: test +date: Thu Jan 01 00:00:07 1970 +0000 +summary: adding cset to branch b + +changeset: 7:10ff5895aa57 +branch: a branch name much longer than the default justification used by branches +user: test +date: Thu Jan 01 00:00:06 1970 +0000 +summary: Adding d branch + +changeset: 10:bfbe841b666e +branch: b +tag: tip +user: test +date: Thu Jan 01 00:00:09 1970 +0000 +summary: adding another cset to branch b + +changeset: 8:eebb944467c9 +branch: b +parent: 4:aee39cd168d0 +user: test +date: Thu Jan 01 00:00:07 1970 +0000 +summary: adding cset to branch b + +changeset: 7:10ff5895aa57 +branch: a branch name much longer than the default justification used by branches +user: test +date: Thu Jan 01 00:00:06 1970 +0000 +summary: Adding d branch + +b 8:eebb944467c9 +a branch name much longer than the default justification used by branches 7:10ff5895aa57 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +--- b branch should be inactive +a branch name much longer than the default justification used by branches 7:10ff5895aa57 +b 12:2da6583810df (closed) +c 6:589736a22561 (inactive) +a 5:d8cbc61dbaa6 (inactive) +default 0:19709c5a4e75 (inactive) +a branch name much longer than the default justification used by branches 7:10ff5895aa57 +--- branch b is back in action +b 13:6ac12926b8c3 +a branch name much longer than the default justification used by branches 7:10ff5895aa57 +changeset: 13:6ac12926b8c3 +branch: b +tag: tip +user: test +date: Thu Jan 01 00:00:09 1970 +0000 +summary: reopen branch with a change + +changeset: 11:c84627f3c15d +branch: b +user: test +date: Thu Jan 01 00:00:09 1970 +0000 +summary: prune bad branch + +changeset: 7:10ff5895aa57 +branch: a branch name much longer than the default justification used by branches +user: test +date: Thu Jan 01 00:00:06 1970 +0000 +summary: Adding d branch + +changeset: 13:6ac12926b8c3 +branch: b +tag: tip +user: test +date: Thu Jan 01 00:00:09 1970 +0000 +summary: reopen branch with a change + +changeset: 7:10ff5895aa57 +branch: a branch name much longer than the default justification used by branches +user: test +date: Thu Jan 01 00:00:06 1970 +0000 +summary: Adding d branch +
--- a/tests/test-command-template Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-command-template Fri Feb 27 08:13:42 2009 -0600 @@ -30,6 +30,9 @@ echo second > second hg add second hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' +echo third > third +hg add third +hg commit -m third -d "2020-01-01 10:01" # make sure user/global hgrc does not affect tests echo '[ui]' > .hg/hgrc @@ -101,6 +104,7 @@ hg log --template '{author|person}\n' hg log --template '{author|user}\n' hg log --template '{date|age}\n' > /dev/null || exit 1 +hg log -l1 --template '{date|age}\n' hg log --template '{date|date}\n' hg log --template '{date|isodate}\n' hg log --template '{date|isodatesec}\n'
--- a/tests/test-command-template.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-command-template.out Fri Feb 27 08:13:42 2009 -0600 @@ -8,7 +8,10 @@ # revision with no copies (used to print a traceback) # compact style works -7[tip]:-1 29114dbae42b 1970-01-12 13:46 +0000 user +8[tip] 946e2bd9c565 2020-01-01 10:01 +0000 test + third + +7:-1 29114dbae42b 1970-01-12 13:46 +0000 user second 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person @@ -32,7 +35,10 @@ 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user line 1 -7[tip]:-1 29114dbae42b 1970-01-12 13:46 +0000 user +8[tip] 946e2bd9c565 2020-01-01 10:01 +0000 test + third + +7:-1 29114dbae42b 1970-01-12 13:46 +0000 user second 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person @@ -56,7 +62,10 @@ 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user line 1 -7[tip]:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 user +8[tip]:7,-1 946e2bd9c565 2020-01-01 10:01 +0000 test + third + +7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 user second 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person @@ -89,6 +98,7 @@ # error if include fails abort: template file ./q: Permission denied # include works +8 7 6 5 @@ -98,6 +108,7 @@ 1 0 # ui.style works +8 7 6 5 @@ -107,11 +118,17 @@ 1 0 # issue338 +2020-01-01 test <test> + + * third: + third + [946e2bd9c565] [tip] + 1970-01-12 User Name <user@hostname> * second: second - [29114dbae42b] [tip] + [29114dbae42b] 1970-01-18 person <person> @@ -154,6 +171,7 @@ [1e4e1b8f71e0] # keys work +author: test author: User Name <user@hostname> author: person author: person @@ -162,6 +180,7 @@ author: other@place author: A. N. Other <other@place> author: User Name <user@hostname> +author--verbose: test author--verbose: User Name <user@hostname> author--verbose: person author--verbose: person @@ -170,6 +189,7 @@ author--verbose: other@place author--verbose: A. N. Other <other@place> author--verbose: User Name <user@hostname> +author--debug: test author--debug: User Name <user@hostname> author--debug: person author--debug: person @@ -181,6 +201,7 @@ branches: branches: branches: +branches: branches: foo branches: branches: @@ -189,6 +210,7 @@ branches--verbose: branches--verbose: branches--verbose: +branches--verbose: branches--verbose: foo branches--verbose: branches--verbose: @@ -197,11 +219,13 @@ branches--debug: branches--debug: branches--debug: +branches--debug: branches--debug: foo branches--debug: branches--debug: branches--debug: branches--debug: +date: 1577872860.00 date: 1000000.00 date: 1500001.00 date: 1500000.00 @@ -210,6 +234,7 @@ date: 1200000.00 date: 1100000.00 date: 1000000.00 +date--verbose: 1577872860.00 date--verbose: 1000000.00 date--verbose: 1500001.00 date--verbose: 1500000.00 @@ -218,6 +243,7 @@ date--verbose: 1200000.00 date--verbose: 1100000.00 date--verbose: 1000000.00 +date--debug: 1577872860.00 date--debug: 1000000.00 date--debug: 1500001.00 date--debug: 1500000.00 @@ -226,6 +252,7 @@ date--debug: 1200000.00 date--debug: 1100000.00 date--debug: 1000000.00 +desc: third desc: second desc: merge desc: new head @@ -238,6 +265,7 @@ other 3 desc: line 1 line 2 +desc--verbose: third desc--verbose: second desc--verbose: merge desc--verbose: new head @@ -250,6 +278,7 @@ other 3 desc--verbose: line 1 line 2 +desc--debug: third desc--debug: second desc--debug: merge desc--debug: new head @@ -262,6 +291,7 @@ other 3 desc--debug: line 1 line 2 +file_adds: third file_adds: second file_adds: file_adds: d @@ -270,6 +300,7 @@ file_adds: c file_adds: b file_adds: a +file_adds--verbose: third file_adds--verbose: second file_adds--verbose: file_adds--verbose: d @@ -278,6 +309,7 @@ file_adds--verbose: c file_adds--verbose: b file_adds--verbose: a +file_adds--debug: third file_adds--debug: second file_adds--debug: file_adds--debug: d @@ -294,6 +326,8 @@ file_dels: file_dels: file_dels: +file_dels: +file_dels--verbose: file_dels--verbose: file_dels--verbose: file_dels--verbose: @@ -310,6 +344,8 @@ file_dels--debug: file_dels--debug: file_dels--debug: +file_dels--debug: +file_mods: file_mods: file_mods: file_mods: @@ -322,6 +358,7 @@ file_mods--verbose: file_mods--verbose: file_mods--verbose: +file_mods--verbose: file_mods--verbose: c file_mods--verbose: file_mods--verbose: @@ -330,10 +367,12 @@ file_mods--debug: file_mods--debug: file_mods--debug: +file_mods--debug: file_mods--debug: c file_mods--debug: file_mods--debug: file_mods--debug: +files: third files: second files: files: d @@ -342,6 +381,7 @@ files: c files: b files: a +files--verbose: third files--verbose: second files--verbose: files--verbose: d @@ -350,6 +390,7 @@ files--verbose: c files--verbose: b files--verbose: a +files--debug: third files--debug: second files--debug: files--debug: d @@ -358,6 +399,7 @@ files--debug: c files--debug: b files--debug: a +manifest: 8:8a0d8faab8b2 manifest: 7:f2dbc354b94e manifest: 6:91015e9dbdd7 manifest: 5:4dc3def4f9b4 @@ -366,6 +408,7 @@ manifest: 2:6e0e82995c35 manifest: 1:4e8d705b1e53 manifest: 0:a0c8bcbbb45c +manifest--verbose: 8:8a0d8faab8b2 manifest--verbose: 7:f2dbc354b94e manifest--verbose: 6:91015e9dbdd7 manifest--verbose: 5:4dc3def4f9b4 @@ -374,6 +417,7 @@ manifest--verbose: 2:6e0e82995c35 manifest--verbose: 1:4e8d705b1e53 manifest--verbose: 0:a0c8bcbbb45c +manifest--debug: 8:8a0d8faab8b2eee97dcfccabbcb18f413c9d097b manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 @@ -382,6 +426,7 @@ manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 +node: 946e2bd9c565394777d74d9669045b39e856e3ea node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f node: 13207e5a10d9fd28ec424934298e176197f2c67f @@ -390,6 +435,7 @@ node: 97054abb4ab824450e9164180baf491ae0078465 node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 node: 1e4e1b8f71e05681d422154f5421e385fec3454f +node--verbose: 946e2bd9c565394777d74d9669045b39e856e3ea node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f @@ -398,6 +444,7 @@ node--verbose: 97054abb4ab824450e9164180baf491ae0078465 node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f +node--debug: 946e2bd9c565394777d74d9669045b39e856e3ea node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f @@ -406,6 +453,7 @@ node--debug: 97054abb4ab824450e9164180baf491ae0078465 node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f +parents: parents: -1:000000000000 parents: 5:13207e5a10d9 4:32a18f097fcc parents: 3:10e46f2dcbf4 @@ -414,6 +462,7 @@ parents: parents: parents: +parents--verbose: parents--verbose: -1:000000000000 parents--verbose: 5:13207e5a10d9 4:32a18f097fcc parents--verbose: 3:10e46f2dcbf4 @@ -422,6 +471,7 @@ parents--verbose: parents--verbose: parents--verbose: +parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 @@ -430,6 +480,7 @@ parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 +rev: 8 rev: 7 rev: 6 rev: 5 @@ -438,6 +489,7 @@ rev: 2 rev: 1 rev: 0 +rev--verbose: 8 rev--verbose: 7 rev--verbose: 6 rev--verbose: 5 @@ -446,6 +498,7 @@ rev--verbose: 2 rev--verbose: 1 rev--verbose: 0 +rev--debug: 8 rev--debug: 7 rev--debug: 6 rev--debug: 5 @@ -462,6 +515,7 @@ tags: tags: tags: +tags: tags--verbose: tip tags--verbose: tags--verbose: @@ -470,6 +524,7 @@ tags--verbose: tags--verbose: tags--verbose: +tags--verbose: tags--debug: tip tags--debug: tags--debug: @@ -478,7 +533,9 @@ tags--debug: tags--debug: tags--debug: +tags--debug: # filters work + hostname @@ -487,6 +544,7 @@ place place hostname +test User Name person person @@ -495,6 +553,7 @@ other A. N. Other User Name +test user person person @@ -503,6 +562,8 @@ other other user +in the future +Wed Jan 01 10:01:00 2020 +0000 Mon Jan 12 13:46:40 1970 +0000 Sun Jan 18 08:40:01 1970 +0000 Sun Jan 18 08:40:00 1970 +0000 @@ -511,6 +572,7 @@ Wed Jan 14 21:20:00 1970 +0000 Tue Jan 13 17:33:20 1970 +0000 Mon Jan 12 13:46:40 1970 +0000 +2020-01-01 10:01 +0000 1970-01-12 13:46 +0000 1970-01-18 08:40 +0000 1970-01-18 08:40 +0000 @@ -519,6 +581,7 @@ 1970-01-14 21:20 +0000 1970-01-13 17:33 +0000 1970-01-12 13:46 +0000 +2020-01-01 10:01:00 +0000 1970-01-12 13:46:40 +0000 1970-01-18 08:40:01 +0000 1970-01-18 08:40:00 +0000 @@ -527,6 +590,7 @@ 1970-01-14 21:20:00 +0000 1970-01-13 17:33:20 +0000 1970-01-12 13:46:40 +0000 +Wed, 01 Jan 2020 10:01:00 +0000 Mon, 12 Jan 1970 13:46:40 +0000 Sun, 18 Jan 1970 08:40:01 +0000 Sun, 18 Jan 1970 08:40:00 +0000 @@ -535,6 +599,7 @@ Wed, 14 Jan 1970 21:20:00 +0000 Tue, 13 Jan 1970 17:33:20 +0000 Mon, 12 Jan 1970 13:46:40 +0000 +third second merge new head @@ -543,6 +608,7 @@ no person other 1 line 1 +946e2bd9c565 29114dbae42b c7b487c6c50e 13207e5a10d9 @@ -551,6 +617,7 @@ 97054abb4ab8 b608e9d1a3f0 1e4e1b8f71e0 +<changeset author="test"/> <changeset author="User Name <user@hostname>"/> <changeset author="person"/> <changeset author="person"/>
--- a/tests/test-convert-bzr-merges Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-convert-bzr-merges Fri Feb 27 08:13:42 2009 -0600 @@ -18,6 +18,7 @@ bzr add -q file-branch1 bzr commit -q -m 'Added branch1 file' cd ../source +sleep 1 echo content > file-parent bzr add -q file-parent bzr commit -q -m 'Added parent file' @@ -27,6 +28,7 @@ echo somecontent > file-branch2 bzr add -q file-branch2 bzr commit -q -m 'Added brach2 file' +sleep 1 cd ../source bzr merge -q ../source-branch1 bzr merge -q --force ../source-branch2
--- a/tests/test-convert-cvs-builtincvsps Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-convert-cvs-builtincvsps Fri Feb 27 08:13:42 2009 -0600 @@ -100,5 +100,22 @@ hgcat b/c hg -R src-filemap log --template '#rev# #desc# files: #files#\n' +echo % commit a new revision with funny log message +cd src +sleep 1 +echo e >> a +cvscall -q commit -m'funny +---------------------------- +log message' . | grep '<--' |\ + sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' +cd .. + +echo % convert again +hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' + echo "graphlog = " >> $HGRCPATH hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n' + +echo % testing debugcvsps +cd src +hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
--- a/tests/test-convert-cvs-builtincvsps.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-convert-cvs-builtincvsps.out Fri Feb 27 08:13:42 2009 -0600 @@ -124,6 +124,22 @@ 2 update tags files: .hgtags 1 ci0 files: b/c 0 Initial revision files: b/c +% commit a new revision with funny log message +checking in src/a,v +% convert again +using builtin cvsps +collecting CVS rlog +9 log entries +creating changesets +6 changeset entries +connecting to cvsrepo +scanning source... +sorting... +converting... +0 funny +o 6 (branch) funny +| ---------------------------- +| log message files: a o 5 (branch) ci2 files: b/c | | o 4 () ci1 files: a b/c @@ -136,3 +152,85 @@ |/ o 0 () Initial revision files: a b/c +% testing debugcvsps +collecting CVS rlog +9 log entries +creating changesets +6 changeset entries +--------------------- +PatchSet 1 +Date: +Author: +Branch: HEAD +Tag: (none) +Log: +Initial revision + +Members: + a:INITIAL->1.1 + b/c:INITIAL->1.1 + +--------------------- +PatchSet 2 +Date: +Author: +Branch: INITIAL +Tag: start +Log: +import + +Members: + a:1.1->1.1.1.1 + b/c:1.1->1.1.1.1 + +--------------------- +PatchSet 3 +Date: +Author: +Branch: HEAD +Tag: (none) +Log: +ci0 + +Members: + b/c:1.1->1.2 + +--------------------- +PatchSet 4 +Date: +Author: +Branch: HEAD +Tag: (none) +Log: +ci1 + +Members: + a:1.1->1.2 + b/c:1.2->1.3 + +--------------------- +PatchSet 5 +Date: +Author: +Branch: branch +Tag: (none) +Log: +ci2 + +Members: + b/c:1.1->1.1.2.1 + +--------------------- +PatchSet 6 +Date: +Author: +Branch: branch +Tag: (none) +Log: +funny +---------------------------- +log message + +Members: + a:1.2->1.2.2.1 +
--- a/tests/test-convert.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-convert.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,6 +1,6 @@ hg convert [OPTION]... SOURCE [DEST [REVMAP]] -Convert a foreign SCM repository to a Mercurial one. +convert a foreign SCM repository to a Mercurial one. Accepted source formats [identifiers]: - Mercurial [hg]
--- a/tests/test-demandimport Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-demandimport Fri Feb 27 08:13:42 2009 -0600 @@ -18,13 +18,6 @@ print "os.system =", f(os.system) print "os =", f(os) -import mercurial.version - -print "mercurial.version =", f(mercurial.version) -print "mercurial.version.get_version =", f(mercurial.version.get_version) -print "mercurial.version =", f(mercurial.version) -print "mercurial =", f(mercurial) - from mercurial import util print "util =", f(util)
--- a/tests/test-demandimport.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-demandimport.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,10 +1,6 @@ os = <unloaded module 'os'> os.system = <built-in function system> os = <module 'os' from '?'> -mercurial.version = <unloaded module 'version'> -mercurial.version.get_version = <function get_version at 0x?> -mercurial.version = <module 'mercurial.version' from '?'> -mercurial = <module 'mercurial' from '?'> util = <unloaded module 'util'> util.system = <function system at 0x?> util = <module 'mercurial.util' from '?'>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-diff-change Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,63 @@ +#!/bin/sh -e + +# test of hg diff --change + +set -e + +ec() { + echo "invoking $@:" + "$@" +} + +hg init a +cd a + +echo "first" > file.txt +hg add file.txt +hg commit -m 'first commit' # 0 + +echo "second" > file.txt +hg commit -m 'second commit' # 1 + +echo "third" > file.txt +hg commit -m 'third commit' # 2 + +ec hg diff --nodates --change 1 + +echo + +#rev=$(hg log -r 1 --template '{node|short}') +rev=e9b286083166 +ec hg diff --nodates --change "$rev" + +## +# Testing diff -c when merge + +for i in 1 2 3 4 5 6 7 8 9 10; do + echo $i >> file.txt +done +hg commit -m "lots of text" # 3 + +sed -e 's,^2$,x,' file.txt > file.txt.tmp +mv file.txt.tmp file.txt +hg commit -m "changed 2 to x" # 4 + +hg up -r 3 > /dev/null 2>&1 # updated, merged, removed, unresolved +sed -e 's,^8$,y,' file.txt > file.txt.tmp +mv file.txt.tmp file.txt +hg commit -m "change 8 to y" > /dev/null 2>&1 # 5 # created new head + +hg up -C -r 4 > /dev/null 2>&1 # updated, merged, removed, unresolved +hg merge -r 5 > /dev/null 2>&1 # updated, merged, removed, unresolved +hg commit -m "merging 8 to y" # 6 + +echo +ec hg diff --nodates --change 6 # must be similar to hg diff --nodates --change 5 + +#echo +#hg log + +echo +echo "EOF" + +# vim: set ts=4 sw=4 et:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-diff-change.out Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,30 @@ +invoking hg diff --nodates --change 1: +diff -r 4bb65dda5db4 -r e9b286083166 file.txt +--- a/file.txt ++++ b/file.txt +@@ -1,1 +1,1 @@ +-first ++second + +invoking hg diff --nodates --change e9b286083166: +diff -r 4bb65dda5db4 -r e9b286083166 file.txt +--- a/file.txt ++++ b/file.txt +@@ -1,1 +1,1 @@ +-first ++second + +invoking hg diff --nodates --change 6: +diff -r e8a0797e73a6 -r aa9873050139 file.txt +--- a/file.txt ++++ b/file.txt +@@ -6,6 +6,6 @@ + 5 + 6 + 7 +-8 ++y + 9 + 10 + +EOF
--- a/tests/test-export Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-export Fri Feb 27 08:13:42 2009 -0600 @@ -19,3 +19,5 @@ grep HG export_internal | wc -l | sed -e 's/^ *//' echo "# exporting 4 changesets to a file" hg export 1 2 3 4 | grep HG | wc -l | sed -e 's/^ *//' +echo "# exporting revision -2 to a file" +hg export -- -2
--- a/tests/test-export.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-export.out Fri Feb 27 08:13:42 2009 -0600 @@ -62,3 +62,19 @@ 4 # exporting 4 changesets to a file 4 +# exporting revision -2 to a file +# HG changeset patch +# User test +# Date 0 0 +# Node ID 5f17a83f5fbd9414006a5e563eab4c8a00729efd +# Parent 747d3c68f8ec44bb35816bfcd59aeb50b9654c2f +foo-10 + +diff -r 747d3c68f8ec -r 5f17a83f5fbd foo +--- a/foo Thu Jan 01 00:00:00 1970 +0000 ++++ b/foo Thu Jan 01 00:00:00 1970 +0000 +@@ -8,3 +8,4 @@ + foo-7 + foo-8 + foo-9 ++foo-10
--- a/tests/test-extdiff Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-extdiff Fri Feb 27 08:13:42 2009 -0600 @@ -32,9 +32,14 @@ echo c >> c hg add c hg ci -m "new branch" -d '1 0' -hg update -C 1 -hg merge tip +hg merge 1 # should diff cloned file against wc file -hg falabala > out || echo "diff-like tools yield a non-zero exit code" +hg falabala > out # cleanup the output since the wc is a tmp directory sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out +# test --change option +hg ci -d '2 0' -mtest3 +hg falabala -c 1 +# check diff are made from the first parent +hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" +#hg log
--- a/tests/test-extdiff.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-extdiff.out Fri Feb 27 08:13:42 2009 -0600 @@ -20,6 +20,7 @@ -o --option pass option to comparison program -r --rev revision + -c --change change made by revision -I --include include names matching the given patterns -X --exclude exclude names matching the given patterns @@ -27,8 +28,9 @@ diffing a.8a5febb7f867/a a.34eed99112ab/a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head -1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a +diffing a.8a5febb7f867/a a.34eed99112ab/a +diffing a.2a13a4d2da36/a a.46c0e4daeb72/a diff-like tools yield a non-zero exit code -diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c
--- a/tests/test-globalopts.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-globalopts.out Fri Feb 27 08:13:42 2009 -0600 @@ -177,7 +177,7 @@ merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision - paths show definition of symbolic path names + paths show aliases for remote repositories pull pull changes from the specified source push push changes to the specified destination recover roll back an interrupted transaction @@ -206,6 +206,8 @@ revisions Specifying Single Revisions multirevs Specifying Multiple Revisions diffs Diff Formats + templating Template Usage + urls Url Paths use "hg -v help" to show aliases and global options Mercurial Distributed SCM @@ -240,7 +242,7 @@ merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision - paths show definition of symbolic path names + paths show aliases for remote repositories pull pull changes from the specified source push push changes to the specified destination recover roll back an interrupted transaction @@ -269,6 +271,8 @@ revisions Specifying Single Revisions multirevs Specifying Multiple Revisions diffs Diff Formats + templating Template Usage + urls Url Paths use "hg -v help" to show aliases and global options %% not tested: --debugger
--- a/tests/test-glog Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-glog Fri Feb 27 08:13:42 2009 -0600 @@ -166,3 +166,10 @@ hg commit -mmore hg glog two +echo % incoming and outgoing +cd .. +hg clone -U -r31 repo repo2 +cd repo2 +hg incoming -q --graph | sed -e 's|$HGTMP|[HGTMP]|' +cd .. +hg -R repo outgoing --graph repo2
--- a/tests/test-glog.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-glog.out Fri Feb 27 08:13:42 2009 -0600 @@ -381,3 +381,45 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: two +% incoming and outgoing +requesting all changes +adding changesets +adding manifests +adding file changes +added 31 changesets with 31 changes to 31 files +o 34:0eed7cd895e0 +| +| o 33:2e9d1b521374 +| +o 32:77f7d8438a3c +| +o 27:e9e08174cd30 + +comparing with repo2 +searching for changes +@ changeset: 34:0eed7cd895e0 +| tag: tip +| parent: 32:77f7d8438a3c +| user: test +| date: Thu Jan 01 00:00:34 1970 +0000 +| summary: (34) head +| +| o changeset: 33:2e9d1b521374 +| parent: 18:5a8c9a29ef81 +| user: test +| date: Thu Jan 01 00:00:33 1970 +0000 +| summary: (33) head +| +o changeset: 32:77f7d8438a3c +| parent: 27:e9e08174cd30 +| parent: 31:82ee55204a79 +| user: test +| date: Thu Jan 01 00:00:32 1970 +0000 +| summary: (32) expand +| +o changeset: 27:e9e08174cd30 + parent: 21:e758e8f4ace9 + user: test + date: Thu Jan 01 00:00:27 1970 +0000 + summary: (27) collapse +
--- a/tests/test-hardlinks-safety.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hardlinks-safety.out Fri Feb 27 08:13:42 2009 -0600 @@ -2,10 +2,10 @@ % init adding foo to series file applying foo -Now at: foo +now at: foo adding bar to series file applying bar -Now at: bar +now at: bar 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar %
--- a/tests/test-help.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-help.out Fri Feb 27 08:13:42 2009 -0600 @@ -68,7 +68,7 @@ merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision - paths show definition of symbolic path names + paths show aliases for remote repositories pull pull changes from the specified source push push changes to the specified destination recover roll back an interrupted transaction @@ -97,6 +97,8 @@ revisions Specifying Single Revisions multirevs Specifying Multiple Revisions diffs Diff Formats + templating Template Usage + urls Url Paths use "hg -v help" to show aliases and global options add add the specified files on the next commit @@ -127,7 +129,7 @@ merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision - paths show definition of symbolic path names + paths show aliases for remote repositories pull pull changes from the specified source push push changes to the specified destination recover roll back an interrupted transaction @@ -156,6 +158,8 @@ revisions Specifying Single Revisions multirevs Specifying Multiple Revisions diffs Diff Formats + templating Template Usage + urls Url Paths hg add [OPTION]... [FILE]... add the specified files on the next commit @@ -221,6 +225,7 @@ options: -r --rev revision + -c --change change made by revision -a --text treat all files as text -g --git use git extended diff format --nodates don't include dates in diff headers
--- a/tests/test-hgweb-descend-empties.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hgweb-descend-empties.out Fri Feb 27 08:13:42 2009 -0600 @@ -7,11 +7,10 @@ % manifest with descending 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -23,7 +22,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/9087c84a0f5d">log</a></li> @@ -45,9 +44,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <table class="bigtable"> @@ -61,7 +60,7 @@ <td class="size"></td> <td class="permissions">drwxr-xr-x</td> </tr> -<tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/a1"><img src="/static/coal-folder.png"> a1/</a> <a href="/file/9087c84a0f5d/a1/a2/a3/a4">a2/a3/a4</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity0"><td class="name"><a href="/file/9087c84a0f5d/b1"><img src="/static/coal-folder.png"> b1/</a> <a href="/file/9087c84a0f5d/b1/b2">b2</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/d1"><img src="/static/coal-folder.png"> d1/</a> <a href="/file/9087c84a0f5d/d1/d2">d2</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr> +<tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/a1"><img src="/static/coal-folder.png" alt="dir."/> a1/</a> <a href="/file/9087c84a0f5d/a1/a2/a3/a4">a2/a3/a4</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity0"><td class="name"><a href="/file/9087c84a0f5d/b1"><img src="/static/coal-folder.png" alt="dir."/> b1/</a> <a href="/file/9087c84a0f5d/b1/b2">b2</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr><tr class="fileline parity1"><td class="name"><a href="/file/9087c84a0f5d/d1"><img src="/static/coal-folder.png" alt="dir."/> d1/</a> <a href="/file/9087c84a0f5d/d1/d2">d2</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr> </table> </div>
--- a/tests/test-hgweb-diffs.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hgweb-diffs.out Fri Feb 27 08:13:42 2009 -0600 @@ -6,11 +6,10 @@ % revision 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -21,7 +20,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/0cd96de13884">log</a></li> @@ -45,9 +44,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">a</div> @@ -98,11 +97,10 @@ % diff removed file 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -114,7 +112,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/78e4ebad7cdf">log</a></li> @@ -139,10 +137,10 @@ <h3>diff a @ 1:78e4ebad7cdf</h3> <form class="search" action="/log"> - -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p></p> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">b</div> @@ -188,11 +186,10 @@ % revision 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -203,7 +200,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/0cd96de13884">log</a></li> @@ -227,9 +224,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">a</div> @@ -282,11 +279,10 @@ % diff removed file 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -298,7 +294,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/78e4ebad7cdf">log</a></li> @@ -323,10 +319,10 @@ <h3>diff a @ 1:78e4ebad7cdf</h3> <form class="search" action="/log"> - -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p></p> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">b</div>
--- a/tests/test-hgweb-empty.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hgweb-empty.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,18 +1,17 @@ 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>test: log</title> <link rel="alternate" type="application/atom+xml" - href="/atom-log" title="Atom feed for test"> + href="/atom-log" title="Atom feed for test" /> <link rel="alternate" type="application/rss+xml" - href="/rss-log" title="RSS feed for test"> + href="/rss-log" title="RSS feed for test" /> </head> <body> @@ -20,7 +19,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li class="active">log</li> @@ -42,9 +41,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div> @@ -69,19 +68,18 @@ 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>test: log</title> <link rel="alternate" type="application/atom+xml" - href="/atom-log" title="Atom feed for test"> + href="/atom-log" title="Atom feed for test" /> <link rel="alternate" type="application/rss+xml" - href="/rss-log" title="RSS feed for test"> + href="/rss-log" title="RSS feed for test" /> </head> <body> @@ -89,7 +87,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li class="active">log</li> @@ -111,9 +109,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div> @@ -138,19 +136,18 @@ 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>test: revision graph</title> <link rel="alternate" type="application/atom+xml" - href="/atom-log" title="Atom feed for test: log"> + href="/atom-log" title="Atom feed for test: log" /> <link rel="alternate" type="application/rss+xml" - href="/rss-log" title="RSS feed for test: log"> + href="/rss-log" title="RSS feed for test: log" /> <!--[if IE]><script type="text/javascript" src="/static/excanvas.js"></script><![endif]--> </head> <body> @@ -159,7 +156,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/000000000000">log</a></li> @@ -178,9 +175,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate"> @@ -189,7 +186,7 @@ | rev -1: <a href="/graph/000000000000">(0)</a> <a href="/graph/tip">tip</a> </div> -<noscript>The revision graph only works with JavaScript-enabled browsers.</noscript> +<noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript> <div id="wrapper"> <ul id="nodebgs"></ul> @@ -282,11 +279,10 @@ 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -298,7 +294,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/000000000000">log</a></li> @@ -320,9 +316,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <table class="bigtable">
--- a/tests/test-hgweb-filelog Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hgweb-filelog Fri Feb 27 08:13:42 2009 -0600 @@ -19,6 +19,9 @@ hg mv b c hg ci -m "mv b" +echo c >> c +hg ci -m "change c" + hg log -p hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
--- a/tests/test-hgweb-filelog.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hgweb-filelog.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,8 +1,20 @@ adding b adding a adding a +changeset: 6:38d962e6234d +tag: tip +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: change c + +diff -r a3b6a9e4507e -r 38d962e6234d c +--- a/c Thu Jan 01 00:00:00 1970 +0000 ++++ b/c Thu Jan 01 00:00:00 1970 +0000 +@@ -1,1 +1,2 @@ + b ++c + changeset: 5:a3b6a9e4507e -tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: mv b @@ -76,19 +88,18 @@ % tip - two revisions 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>test: a history</title> <link rel="alternate" type="application/atom+xml" - href="/atom-log/tip/a" title="Atom feed for test:a"> + href="/atom-log/tip/a" title="Atom feed for test:a" /> <link rel="alternate" type="application/rss+xml" - href="/rss-log/tip/a" title="RSS feed for test:a"> + href="/rss-log/tip/a" title="RSS feed for test:a" /> </head> <body> @@ -96,7 +107,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/01de2d66a28d">log</a></li> @@ -122,9 +133,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> @@ -159,19 +170,18 @@ % second version - two revisions 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>test: a history</title> <link rel="alternate" type="application/atom+xml" - href="/atom-log/tip/a" title="Atom feed for test:a"> + href="/atom-log/tip/a" title="Atom feed for test:a" /> <link rel="alternate" type="application/rss+xml" - href="/rss-log/tip/a" title="RSS feed for test:a"> + href="/rss-log/tip/a" title="RSS feed for test:a" /> </head> <body> @@ -179,7 +189,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/01de2d66a28d">log</a></li> @@ -205,9 +215,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> @@ -242,19 +252,18 @@ % first deleted - one revision 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>test: a history</title> <link rel="alternate" type="application/atom+xml" - href="/atom-log/tip/a" title="Atom feed for test:a"> + href="/atom-log/tip/a" title="Atom feed for test:a" /> <link rel="alternate" type="application/rss+xml" - href="/rss-log/tip/a" title="RSS feed for test:a"> + href="/rss-log/tip/a" title="RSS feed for test:a" /> </head> <body> @@ -262,7 +271,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/5ed941583260">log</a></li> @@ -288,9 +297,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> @@ -320,19 +329,18 @@ % first version - one revision 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>test: a history</title> <link rel="alternate" type="application/atom+xml" - href="/atom-log/tip/a" title="Atom feed for test:a"> + href="/atom-log/tip/a" title="Atom feed for test:a" /> <link rel="alternate" type="application/rss+xml" - href="/rss-log/tip/a" title="RSS feed for test:a"> + href="/rss-log/tip/a" title="RSS feed for test:a" /> </head> <body> @@ -340,7 +348,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/5ed941583260">log</a></li> @@ -366,9 +374,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="navigate"><a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> @@ -398,11 +406,10 @@ % before addition - error 404 Not Found -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -431,8 +438,8 @@ <form class="search" action="/log"> <p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description"> @@ -474,8 +481,8 @@ <a href="/shortlog?style=spartan">shortlog</a> <a href="/graph?style=spartan">graph</a> <a href="/tags?style=spartan">tags</a> -<a href="/file/a3b6a9e4507e/c?style=spartan">file</a> -<a href="/annotate/a3b6a9e4507e/c?style=spartan">annotate</a> +<a href="/file/38d962e6234d/c?style=spartan">file</a> +<a href="/annotate/38d962e6234d/c?style=spartan">annotate</a> <a type="application/rss+xml" href="/rss-log/tip/c">rss</a> <a type="application/atom+xml" href="/atom-log/tip/c" title="Atom feed for test:c">atom</a> </div> @@ -487,6 +494,31 @@ <table class="logEntry parity0"> <tr> <th class="age">many years ago:</th> + <th class="firstline"><a href="/rev/38d962e6234d?style=spartan">change c</a></th> + </tr> + <tr> + <th class="revision">revision 1:</td> + <td class="node"> + <a href="/file/38d962e6234d/c?style=spartan">38d962e6234d</a> + <a href="/diff/38d962e6234d/c?style=spartan">(diff)</a> + <a href="/annotate/38d962e6234d/c?style=spartan">(annotate)</a> + </td> + </tr> + + <tr> + <th class="author">author:</th> + <td class="author">test</td> + </tr> + <tr> + <th class="date">date:</th> + <td class="date">Thu Jan 01 00:00:00 1970 +0000</td> + </tr> +</table> + + +<table class="logEntry parity1"> + <tr> + <th class="age">many years ago:</th> <th class="firstline"><a href="/rev/a3b6a9e4507e?style=spartan">mv b</a></th> </tr> <tr>
--- a/tests/test-hgweb-removed.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hgweb-removed.out Fri Feb 27 08:13:42 2009 -0600 @@ -4,11 +4,10 @@ % revision 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -19,7 +18,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/c78f6c5cbea9">log</a></li> @@ -43,9 +42,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">del</div> @@ -92,11 +91,10 @@ % diff removed file 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -108,7 +106,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/c78f6c5cbea9">log</a></li> @@ -133,10 +131,10 @@ <h3>diff a @ 1:c78f6c5cbea9</h3> <form class="search" action="/log"> - -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p></p> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">del</div>
--- a/tests/test-hgweb.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hgweb.out Fri Feb 27 08:13:42 2009 -0600 @@ -21,11 +21,10 @@ % should give a 404 - static file that does not exist 404 Not Found -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -54,8 +53,8 @@ <form class="search" action="/log"> <p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description"> @@ -91,11 +90,10 @@ error: bork@2ef0ac749a14: not found in manifest 404 Not Found -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -124,8 +122,8 @@ <form class="search" action="/log"> <p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">
--- a/tests/test-highlight Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-highlight Fri Feb 27 08:13:42 2009 -0600 @@ -68,7 +68,7 @@ echo % errors encountered cat errors.log -kill `cat hg.pid` +"$TESTDIR/killdaemons.py" # Change the pygments style cat > .hg/hgrc <<EOF @@ -87,4 +87,3 @@ echo % errors encountered cat errors.log -
--- a/tests/test-highlight.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-highlight.out Fri Feb 27 08:13:42 2009 -0600 @@ -4,11 +4,10 @@ % hgweb filerevision, html 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -21,7 +20,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/e55e3a42c53a">log</a></li> @@ -47,9 +46,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">a</div> @@ -90,11 +89,10 @@ % hgweb filerevision, html 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -107,7 +105,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/e55e3a42c53a">log</a></li> @@ -133,9 +131,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">a</div> @@ -176,11 +174,10 @@ % hgweb fileannotate, html 200 Script output follows -<!-- quirksmode --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> -<link rel="icon" href="/static/hgicon.png" type="image/png"> +<link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> @@ -193,7 +190,7 @@ <div class="menu"> <div class="logo"> <a href="http://www.selenic.com/mercurial/"> -<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> +<img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="/shortlog/e55e3a42c53a">log</a></li> @@ -220,9 +217,9 @@ <form class="search" action="/log"> -<p><input name="rev" id="search1" type="text" size="30"></p> -<span>find changesets by author, revision, -files, or words in the commit message</span> +<p><input name="rev" id="search1" type="text" size="30" /></p> +<div id="hint">find changesets by author, revision, +files, or words in the commit message</div> </form> <div class="description">a</div>
--- a/tests/test-hook.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-hook.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,18 +1,18 @@ precommit hook: HG_PARENT1=0000000000000000000000000000000000000000 -pretxncommit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 +pretxncommit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=true 0:29b62aeb769f commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b -pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b +pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=true 1:b702efe96888 commit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b commit.b hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b -pretxncommit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b +pretxncommit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=true 2:1324a5531bac commit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b commit.b hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b @@ -20,7 +20,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) precommit hook: HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 -pretxncommit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 +pretxncommit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PENDING=true 3:4c52fb2e4022 commit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 commit.b hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 @@ -43,7 +43,7 @@ (run 'hg update' to get a working copy) pretag hook: HG_LOCAL=0 HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_TAG=a precommit hook: HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 -pretxncommit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 +pretxncommit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 HG_PENDING=true 4:8ea2ef7ad3e8 commit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 commit.b hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 @@ -58,9 +58,9 @@ abort: pretag.forbid hook exited with status 1 4:8ea2ef7ad3e8 precommit hook: HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 -pretxncommit hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 +pretxncommit hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=true 5:fad284daf8c0 -pretxncommit.forbid hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 +pretxncommit.forbid hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=true transaction abort! rollback completed abort: pretxncommit.forbid1 hook exited with status 1 @@ -80,7 +80,7 @@ searching for changes abort: prechangegroup.forbid hook exited with status 1 4:8ea2ef7ad3e8 -pretxnchangegroup.forbid hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_SOURCE=pull HG_URL=file: +pretxnchangegroup.forbid hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=true HG_SOURCE=pull HG_URL=file: pulling from ../a searching for changes adding changesets
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-identify Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,44 @@ +#!/bin/sh + +echo % no repo +hg id + +echo % create repo +hg init test +cd test +echo a > a +hg ci -Ama + +echo % basic id usage +hg id +hg id --debug +hg id -q +hg id -v + +echo % with options +hg id -r. +hg id -n +hg id -t +hg id -b +hg id -i +hg id -n -t -b -i + +echo % with modifications +echo b > a +hg id -n -t -b -i + +echo % other local repo +cd .. +hg -R test id +hg id test + +echo % with remote http repo +cd test +hg serve -p $HGPORT1 -d --pid-file=hg.pid +cat hg.pid >> $DAEMON_PIDS +hg id http://localhost:$HGPORT1/ + +echo % remote with tags? +hg id -t http://localhost:$HGPORT1/ + +true # ends with util.Abort -> returns 255
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-identify.out Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,25 @@ +% no repo +abort: There is no Mercurial repository here (.hg not found) +% create repo +adding a +% basic id usage +cb9a9f314b8b tip +cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b tip +cb9a9f314b8b +cb9a9f314b8b tip +% with options +cb9a9f314b8b tip +0 +tip +default +cb9a9f314b8b +cb9a9f314b8b 0 default tip +% with modifications +cb9a9f314b8b+ 0+ default tip +% other local repo +cb9a9f314b8b+ tip +cb9a9f314b8b+ tip +% with remote http repo +cb9a9f314b8b +% remote with tags? +abort: can't query remote revision number, branch, or tags
--- a/tests/test-incoming-outgoing Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-incoming-outgoing Fri Feb 27 08:13:42 2009 -0600 @@ -21,6 +21,8 @@ hg -R new incoming -r 4 test echo "% limit to 2 changesets" hg -R new incoming -l 2 test +echo "% limit to 2 changesets, test with -p --git" +hg -R new incoming -l 2 -p --git test # test with --bundle http_proxy= hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
--- a/tests/test-incoming-outgoing.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-incoming-outgoing.out Fri Feb 27 08:13:42 2009 -0600 @@ -163,6 +163,32 @@ date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 +% limit to 2 changesets, test with -p --git +comparing with test +changeset: 0:9cb21d99fe27 +user: test +date: Mon Jan 12 13:46:40 1970 +0000 +summary: 0 + +diff --git a/foo b/foo +new file mode 100644 +--- /dev/null ++++ b/foo +@@ -0,0 +1,1 @@ ++0 + +changeset: 1:d717f5dfad6a +user: test +date: Mon Jan 12 13:46:40 1970 +0000 +summary: 1 + +diff --git a/foo b/foo +--- a/foo ++++ b/foo +@@ -1,1 +1,2 @@ + 0 ++1 + comparing with http://localhost/ changeset: 0:9cb21d99fe27 user: test
--- a/tests/test-inherit-mode.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-inherit-mode.out Fri Feb 27 08:13:42 2009 -0600 @@ -41,7 +41,7 @@ % group can still write everything 00770 ../push/.hg/ 00660 ../push/.hg/00changelog.i -00660 ../push/.hg/branch.cache +00660 ../push/.hg/branchheads.cache 00660 ../push/.hg/requires 00770 ../push/.hg/store/ 00660 ../push/.hg/store/00changelog.i
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue1438 Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,16 @@ +#!/bin/sh +"$TESTDIR/hghave" symlink || exit 80 + +rm -rf a +hg init a +cd a + +ln -s foo link +hg add link +hg ci -mbad link +hg rm link +hg ci -mok +hg diff -g -r 0:1 > bad.patch +hg up 0 +hg import --no-commit bad.patch +hg st
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue1438.out Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +applying bad.patch +R link +? bad.patch
--- a/tests/test-keyword.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-keyword.out Fri Feb 27 08:13:42 2009 -0600 @@ -213,15 +213,15 @@ +$Id$ +tests for different changenodes % qpop -Patch queue now empty +patch queue now empty % qgoto - should imply qpush applying mqtest.diff -Now at: mqtest.diff +now at: mqtest.diff % cat $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ tests for different changenodes % qpop and move on -Patch queue now empty +patch queue now empty % copy % kwfiles added a
--- a/tests/test-log Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-log Fri Feb 27 08:13:42 2009 -0600 @@ -95,6 +95,9 @@ echo % log -P 2 hg log -P 2 +echo '% log -r tip -p --git' +hg log -r tip -p --git + echo '% log -r ""' hg log -r ''
--- a/tests/test-log.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-log.out Fri Feb 27 08:13:42 2009 -0600 @@ -221,6 +221,20 @@ date: Thu Jan 01 00:00:01 1970 +0000 summary: b1 +% log -r tip -p --git +changeset: 6:2404bbcab562 +tag: tip +user: test +date: Thu Jan 01 00:00:01 1970 +0000 +summary: b1.1 + +diff --git a/b1 b/b1 +--- a/b1 ++++ b/b1 +@@ -1,1 +1,2 @@ + b1 ++postm + % log -r "" abort: 00changelog.i@: ambiguous identifier! % log -r <some unknown node id>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-tools Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,153 @@ +#!/bin/sh + +# test merge-tools configuration - mostly exercising filemerge.py + +unset HGMERGE # make sure HGMERGE doesn't interfere with the test + +hg init + +echo "# revision 0" +echo "revision 0" > f +echo "space" >> f +hg commit -Am "revision 0" -d "1000000 0" + +echo "# revision 1" +echo "revision 1" > f +echo "space" >> f +hg commit -Am "revision 1" -d "1000000 0" + +hg update 0 > /dev/null +echo "# revision 2" +echo "revision 2" > f +echo "space" >> f +hg commit -Am "revision 2" -d "1000000 0" + +hg update 0 > /dev/null +echo "# revision 3 - simple to merge" +echo "revision 3" >> f +hg commit -Am "revision 3" -d "1000000 0" + + +echo "[merge-tools]" > .hg/hgrc +echo + +beforemerge() { + cat .hg/hgrc + echo "# hg update -C 1" + hg update -C 1 > /dev/null +} + +aftermerge() { + echo "# cat f" + cat f + echo "# hg stat" + hg stat + rm -f f.orig + echo +} + +domerge() { + beforemerge + echo "# hg merge $*" + hg merge $* + aftermerge +} + +echo +echo Tool selection +echo + +echo "# default is internal merge:" +beforemerge +echo "# hg merge -r 2" +PATH=$BINDIR hg merge -r 2 +aftermerge + +echo "# simplest hgrc using false for merge:" +echo "false.whatever=" >> .hg/hgrc +domerge -r 2 + +echo "# true with higher .priority gets precedence:" +echo "true.priority=1" >> .hg/hgrc +domerge -r 2 + +echo "# unless lowered on command line:" +domerge -r 2 --config merge-tools.true.priority=-7 + +echo "# or false set higher on command line:" +domerge -r 2 --config merge-tools.false.priority=117 + +echo "# or true.executable not found in PATH:" +domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool + +echo "# or true.executable with bogus path:" +domerge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool + +echo "# but true.executable set to cat found in PATH works:" +echo "true.executable=cat" >> .hg/hgrc +domerge -r 2 + +echo "# and true.executable set to cat with path works:" +domerge -r 2 --config merge-tools.true.executable=/bin/cat + + +echo +echo Tool selection and merge-patterns +echo + +echo "# merge-patterns specifies new tool false:" +domerge -r 2 --config merge-patterns.f=false + +echo "# merge-patterns specifies executable not found in PATH and gets warning:" +domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool + +echo "# merge-patterns specifies executable with bogus path and gets warning:" +domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool + + +echo +echo Premerge +echo + +echo "# Default is silent simplemerge:" +domerge -r 3 + +echo "# .premerge=True is same:" +domerge -r 3 --config merge-tools.true.premerge=True + +echo "# .premerge=False executes merge-tool:" +domerge -r 3 --config merge-tools.true.premerge=False + + +echo +echo Tool execution +echo + +echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other' +beforemerge +hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \ + | sed 's,==> .* <==,==> ... <==,g' +aftermerge + +echo '# Merge with "echo mergeresult > $local":' +beforemerge +hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local' +aftermerge + +echo '# - and $local is the file f:' +beforemerge +hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f' +aftermerge + +echo '# Merge with "echo mergeresult > $output" - the variable is a bit magic:' +beforemerge +hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output' +aftermerge + + +echo +echo Merge post-processing +echo + +echo "# cat is a bad merge-tool and doesn't change:" +domerge -r 2 --config merge-tools.true.checkchanged=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-tools.out Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,395 @@ +# revision 0 +adding f +# revision 1 +# revision 2 +created new head +# revision 3 - simple to merge +created new head + + +Tool selection + +# default is internal merge: +[merge-tools] +# hg update -C 1 +# hg merge -r 2 +merging f +warning: conflicts during merge. +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +<<<<<<< local +revision 1 +======= +revision 2 +>>>>>>> other +space +# hg stat +M f +? f.orig + +# simplest hgrc using false for merge: +[merge-tools] +false.whatever= +# hg update -C 1 +# hg merge -r 2 +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + +# true with higher .priority gets precedence: +[merge-tools] +false.whatever= +true.priority=1 +# hg update -C 1 +# hg merge -r 2 +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +# hg stat +M f + +# unless lowered on command line: +[merge-tools] +false.whatever= +true.priority=1 +# hg update -C 1 +# hg merge -r 2 --config merge-tools.true.priority=-7 +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + +# or false set higher on command line: +[merge-tools] +false.whatever= +true.priority=1 +# hg update -C 1 +# hg merge -r 2 --config merge-tools.false.priority=117 +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + +# or true.executable not found in PATH: +[merge-tools] +false.whatever= +true.priority=1 +# hg update -C 1 +# hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + +# or true.executable with bogus path: +[merge-tools] +false.whatever= +true.priority=1 +# hg update -C 1 +# hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + +# but true.executable set to cat found in PATH works: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 +revision 1 +space +revision 0 +space +revision 2 +space +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +# hg stat +M f + +# and true.executable set to cat with path works: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 --config merge-tools.true.executable=/bin/cat +revision 1 +space +revision 0 +space +revision 2 +space +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +# hg stat +M f + + +Tool selection and merge-patterns + +# merge-patterns specifies new tool false: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 --config merge-patterns.f=false +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + +# merge-patterns specifies executable not found in PATH and gets warning: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool +couldn't find merge tool true specified for f +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + +# merge-patterns specifies executable with bogus path and gets warning: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool +couldn't find merge tool true specified for f +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig + + +Premerge + +# Default is silent simplemerge: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 3 +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +revision 3 +# hg stat +M f + +# .premerge=True is same: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 3 --config merge-tools.true.premerge=True +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +revision 3 +# hg stat +M f + +# .premerge=False executes merge-tool: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 3 --config merge-tools.true.premerge=False +revision 1 +space +revision 0 +space +revision 0 +space +revision 3 +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +# hg stat +M f + + +Tool execution + +# set tools.args explicit to include $base $local $other $output: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +==> ... <== +revision 0 +space + +==> ... <== +revision 1 +space + +==> ... <== +revision 2 +space + +==> ... <== +revision 1 +space +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +# hg stat +M f + +# Merge with "echo mergeresult > $local": +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +mergeresult +# hg stat +M f + +# - and $local is the file f: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +mergeresult +# hg stat +M f + +# Merge with "echo mergeresult > $output" - the variable is a bit magic: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +mergeresult +# hg stat +M f + + +Merge post-processing + +# cat is a bad merge-tool and doesn't change: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 --config merge-tools.true.checkchanged=1 +revision 1 +space +revision 0 +space +revision 2 +space +merging f +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +# cat f +revision 1 +space +# hg stat +M f +? f.orig +
--- a/tests/test-mq Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq Fri Feb 27 08:13:42 2009 -0600 @@ -289,7 +289,7 @@ hg strip -qn tip hg tip 2>&1 | sed -e 's/unknown node .*/unknown node/' hg branches 2>&1 | sed -e 's/unknown node .*/unknown node/' -hg qpop +hg qpop 2>&1 | sed -e 's/unknown node .*/unknown node/' cat >>$HGRCPATH <<EOF [diff] @@ -510,3 +510,8 @@ hg st hg diff --config diff.nodates=True hg qdiff --config diff.nodates=True + +echo % test popping revisions not in working dir ancestry +hg qseries -v +hg up qparent +hg qpop
--- a/tests/test-mq-caches Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-caches Fri Feb 27 08:13:42 2009 -0600 @@ -1,6 +1,6 @@ #!/bin/sh -branches=.hg/branch.cache +branches=.hg/branchheads.cache echo '[extensions]' >> $HGRCPATH echo 'hgext.mq=' >> $HGRCPATH
--- a/tests/test-mq-caches.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-caches.out Fri Feb 27 08:13:42 2009 -0600 @@ -5,7 +5,7 @@ No branch cache # some regular revisions -Patch queue now empty +patch queue now empty tip: 1 3f910abad313ff802d3a23a7529433872df9b3ae 1 3f910abad313ff802d3a23a7529433872df9b3ae bar @@ -13,7 +13,7 @@ # add some mq patches applying p1 -Now at: p1 +now at: p1 tip: 2 3f910abad313ff802d3a23a7529433872df9b3ae 1 3f910abad313ff802d3a23a7529433872df9b3ae bar @@ -43,11 +43,11 @@ qbase: 1 # detect an invalid cache -Patch queue now empty +patch queue now empty applying p0 applying p1 applying p2 -Now at: p2 +now at: p2 tip: 3 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
--- a/tests/test-mq-guards Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-guards Fri Feb 27 08:13:42 2009 -0600 @@ -53,7 +53,7 @@ echo % should push a.patch hg qpush -hg qguard c.patch -a +hg qguard -- c.patch -a echo % should print -a hg qguard c.patch @@ -95,7 +95,7 @@ hg qpush hg qpop -a -hg qguard a.patch +1 +2 -3 +hg qguard -- a.patch +1 +2 -3 hg qselect 1 2 3 echo % list patches and guards hg qguard -l
--- a/tests/test-mq-guards.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-guards.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,68 +1,68 @@ adding x -Patch queue now empty +patch queue now empty % should fail abort: no patch named does-not-exist.patch % should fail abort: no patches applied applying a.patch -Now at: a.patch +now at: a.patch % should guard a.patch % should print +a a.patch: +a -Patch queue now empty +patch queue now empty % should fail cannot push 'a.patch' - guarded by ['+a'] a.patch: +a % should push b.patch applying b.patch -Now at: b.patch -Patch queue now empty +now at: b.patch +patch queue now empty % test selection of an empty guard abort: guard cannot be an empty string number of unguarded, unapplied patches has changed from 2 to 3 % should push a.patch applying a.patch -Now at: a.patch +now at: a.patch % should print -a c.patch: -a % should skip c.patch applying b.patch skipping c.patch - guarded by '-a' -Now at: b.patch +now at: b.patch % should display b.patch b.patch % should push c.patch applying c.patch -Now at: c.patch -Patch queue now empty +now at: c.patch +patch queue now empty guards deactivated number of unguarded, unapplied patches has changed from 3 to 2 % should push all applying b.patch applying c.patch -Now at: c.patch -Patch queue now empty +now at: c.patch +patch queue now empty number of unguarded, unapplied patches has changed from 1 to 2 % should push a.patch, not b.patch applying a.patch -Now at: a.patch +now at: a.patch applying c.patch -Now at: c.patch -Patch queue now empty +now at: c.patch +patch queue now empty % should push b.patch applying b.patch -Now at: b.patch +now at: b.patch applying c.patch -Now at: c.patch +now at: c.patch c.patch -Patch queue now empty +patch queue now empty number of unguarded, unapplied patches has changed from 2 to 3 % should push a.patch, b.patch applying a.patch -Now at: a.patch +now at: a.patch applying b.patch -Now at: b.patch -Patch queue now empty +now at: b.patch +patch queue now empty number of unguarded, unapplied patches has changed from 3 to 2 % list patches and guards a.patch: +1 +2 -3 @@ -78,15 +78,15 @@ 3 % should push b.patch applying b.patch -Now at: b.patch +now at: b.patch applying c.patch -Now at: c.patch +now at: c.patch guards deactivated popping guarded patches -Patch queue now empty +patch queue now empty reapplying unguarded patches applying c.patch -Now at: c.patch +now at: c.patch % guards in series file: +1 +2 -3 +1 +2 @@ -100,7 +100,7 @@ new.patch: +1 +2 -3 b.patch: +2 c.patch: unguarded -Now at: c.patch +now at: c.patch % should show new.patch and b.patch as Guarded, c.patch as Applied % and d.patch as Unapplied 0 G new.patch @@ -112,7 +112,7 @@ 1 G b.patch 2 A c.patch 3 G d.patch -Patch queue now empty +patch queue now empty new.patch: +1 +2 -3 b.patch: +2 c.patch: unguarded @@ -141,7 +141,7 @@ skipping b.patch - guarded by ['+2'] applying c.patch skipping d.patch - guarded by ['+2'] -Now at: c.patch +now at: c.patch % hg qapplied new.patch c.patch
--- a/tests/test-mq-header-date.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-header-date.out Fri Feb 27 08:13:42 2009 -0600 @@ -42,7 +42,7 @@ +2 1: [mq]: 2.patch - test 0: [mq]: 1.patch - test -Now at: 1.patch +now at: 1.patch ==== qnew -d -m # HG changeset patch # Date 6 0 @@ -127,10 +127,9 @@ 2: Four - test 1: Three (again) - test 0: [mq]: 1.patch - test -Now at: 3.patch +now at: 3.patch ==== qnew with HG header -Now at: 3.patch -Now at: 5.patch +now at: 3.patch # HG changeset patch # Date 10 0 2: imported patch 5.patch - test - 10.00 @@ -186,7 +185,7 @@ 2: [mq]: 5.patch - test 1: Three (again) - test 0: [mq]: 1.patch - test -Now at: 5.patch +now at: 5.patch ==== qnew -d adding 7 # HG changeset patch @@ -241,7 +240,7 @@ 2: [mq]: 5.patch - test 1: Three (again) - test 0: [mq]: 1.patch - test -Now at: 7.patch +now at: 7.patch ==== qnew -m adding 9 Nine @@ -271,14 +270,14 @@ 2: [mq]: 5.patch - test 1: Three (again) - test 0: [mq]: 1.patch - test -Now at: 7.patch +now at: 7.patch ==== qpop -a / qpush -a -Patch queue now empty +patch queue now empty applying 1.patch applying 3.patch applying 5.patch applying 7.patch -Now at: 7.patch +now at: 7.patch 3: imported patch 7.patch - john - 13.00 2: imported patch 5.patch - test - 11.00 1: Three (again) - test - 8.00
--- a/tests/test-mq-header-from Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-header-from Fri Feb 27 08:13:42 2009 -0600 @@ -83,7 +83,7 @@ hg qpop echo "# HG changeset patch" >>.hg/patches/5.patch echo "# User johndoe" >>.hg/patches/5.patch -hg qpush 2>&1 | grep 'Now at' +hg qpush 2>&1 | grep 'now at' catlog 5 echo ==== hg qref
--- a/tests/test-mq-header-from.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-header-from.out Fri Feb 27 08:13:42 2009 -0600 @@ -131,8 +131,8 @@ 1: [mq]: 2.patch - jane 0: [mq]: 1.patch - mary ==== qnew with HG header -Now at: 4.patch -Now at: 5.patch +now at: 4.patch +now at: 5.patch # HG changeset patch # User johndoe 4: imported patch 5.patch - johndoe @@ -184,13 +184,13 @@ 1: [mq]: 2.patch - jane 0: [mq]: 1.patch - mary ==== qpop -a / qpush -a -Patch queue now empty +patch queue now empty applying 1.patch applying 2.patch applying 3.patch applying 4.patch applying 5.patch -Now at: 5.patch +now at: 5.patch 4: imported patch 5.patch - johndeere 3: Four - jane 2: Three (again) - maria
--- a/tests/test-mq-merge.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-merge.out Fri Feb 27 08:13:42 2009 -0600 @@ -8,9 +8,9 @@ b merging with queue at: .hg/patches.1 applying rm_a -Now at: rm_a +now at: rm_a b -Patch queue now empty +patch queue now empty % init t2 adding a @@ -21,4 +21,4 @@ merging with queue at refqueue (working directory not at tip) applying patcha -Now at: patcha +now at: patcha
--- a/tests/test-mq-missingfiles.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-missingfiles.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,12 +1,12 @@ adding b -Patch queue now empty +patch queue now empty % push patch with missing target applying changeb unable to find 'b' for patching 2 out of 2 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir -Errors during apply, please fix and refresh changeb +errors during apply, please fix and refresh changeb % display added files a c @@ -26,7 +26,7 @@ +c +c adding b -Patch queue now empty +patch queue now empty % push git patch with missing target applying changeb unable to find 'b' for patching @@ -35,7 +35,7 @@ b: No such file or directory b not tracked! patch failed, rejects left in working dir -Errors during apply, please fix and refresh changeb +errors during apply, please fix and refresh changeb ? b.rej % display added files a @@ -49,6 +49,6 @@ % test push creating directory during git copy or rename adding a -Patch queue now empty +patch queue now empty applying patch -Now at: patch +now at: patch
--- a/tests/test-mq-pull-from-bundle.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-pull-from-bundle.out Fri Feb 27 08:13:42 2009 -0600 @@ -13,7 +13,7 @@ 1: main: one updated. ====== Setup queue adding two -Patch queue now empty +patch queue now empty ====== Bundle queue 1 changesets found ====== Clone base
--- a/tests/test-mq-qclone-http.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qclone-http.out Fri Feb 27 08:13:42 2009 -0600 @@ -25,7 +25,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a applying b.patch -Now at: b.patch +now at: b.patch imported patch b.patch a % test with normal collection @@ -50,7 +50,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a applying b.patch -Now at: b.patch +now at: b.patch imported patch b.patch a % test with old-style collection @@ -75,6 +75,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a applying b.patch -Now at: b.patch +now at: b.patch imported patch b.patch a
--- a/tests/test-mq-qdelete.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qdelete.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,14 +1,14 @@ adding base abort: qdelete requires at least one revision or patch name abort: cannot delete applied patch c -Now at: b +now at: b a b a b series status -Now at: a +now at: a a b series @@ -27,10 +27,11 @@ no patches applied abort: revision 0 is not managed abort: cannot delete revision 2 above applied patches -Now at: b +now at: b abort: unknown revision 'c'! applying c -Now at: c +patch c is empty +now at: c c 3 imported patch c 2 [mq]: b
--- a/tests/test-mq-qdiff.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qdiff.out Fri Feb 27 08:13:42 2009 -0600 @@ -26,7 +26,7 @@ +patched % revert % qpop -Patch queue now empty +patch queue now empty % qdelete mqbase % commit 2 adding lines
--- a/tests/test-mq-qgoto.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qgoto.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,21 +1,21 @@ adding a -Now at: a.patch +now at: a.patch applying b.patch applying c.patch -Now at: c.patch -Now at: b.patch +now at: c.patch +now at: b.patch % Using index -Now at: a.patch +now at: a.patch applying b.patch applying c.patch -Now at: c.patch +now at: c.patch % No warnings when using index -Now at: b.patch +now at: b.patch applying c.patch applying bug314159 -Now at: bug314159 +now at: bug314159 % Detect ambiguous non-index patch name "14" is ambiguous:
--- a/tests/test-mq-qimport.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qimport.out Fri Feb 27 08:13:42 2009 -0600 @@ -6,19 +6,19 @@ % import patch that already exists abort: patch "url.diff" already exists applying url.diff -Now at: url.diff +now at: url.diff foo -Patch queue now empty +patch queue now empty % qimport -f adding url.diff to series file applying url.diff -Now at: url.diff +now at: url.diff foo2 -Patch queue now empty +patch queue now empty % build diff with CRLF adding b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % qimport CRLF diff adding b.diff to series file applying b.diff -Now at: b.diff +now at: b.diff
--- a/tests/test-mq-qnew.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qnew.out Fri Feb 27 08:13:42 2009 -0600 @@ -20,7 +20,7 @@ abort: patch "first.patch" already exists abort: patch "first.patch" already exists % qnew -f from a subdirectory -Patch queue now empty +patch queue now empty adding d/b M d/b diff --git a/d/b b/d/b
--- a/tests/test-mq-qpush-fail.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qpush-fail.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,5 +1,5 @@ adding foo -Patch queue now empty +patch queue now empty applying patch1 applying patch2 applying bad-patch
--- a/tests/test-mq-qrefresh-replace-log-message.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-qrefresh-replace-log-message.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,7 +1,7 @@ ======================= Should fail if no patches applied -No patches applied -No patches applied +no patches applied +no patches applied ======================= Should display 'First commit message' description:
--- a/tests/test-mq-safety.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-safety.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,7 +1,7 @@ % try to commit on top of a patch abort: cannot commit over an applied mq patch % qpop/qrefresh on the wrong revision -abort: working directory revision is not qtip +abort: popping would remove a revision not managed by this patch queue using patch queue: abort: popping would remove a revision not managed by this patch queue abort: working directory revision is not qtip
--- a/tests/test-mq-symlinks.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq-symlinks.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,10 +1,10 @@ a -> a not a symlink a -> b -Now at: base.patch +now at: base.patch applying symlink.patch -Now at: symlink.patch +now at: symlink.patch a -> b -Now at: symlink.patch +now at: symlink.patch applying removesl.patch -Now at: removesl.patch +now at: removesl.patch C b
--- a/tests/test-mq.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-mq.out Fri Feb 27 08:13:42 2009 -0600 @@ -33,7 +33,7 @@ qfold fold the named patches into the current patch qgoto push or pop patches until named patch is at top of stack qguard set or print guards for a patch - qheader Print the header of the topmost or specified patch + qheader print the header of the topmost or specified patch qimport import a patch qinit init a new queue repository qnew create a new patch @@ -108,28 +108,28 @@ a +a % qpop -Patch queue now empty +patch queue now empty % qpush applying test.patch -Now at: test.patch +now at: test.patch % pop/push outside repo -Patch queue now empty +patch queue now empty applying test.patch -Now at: test.patch +now at: test.patch % qrefresh in subdir % pop/push -a in subdir -Patch queue now empty +patch queue now empty applying test.patch applying test2.patch -Now at: test2.patch +now at: test2.patch % qseries test.patch test2.patch -Now at: test.patch +now at: test.patch 0 A test.patch: foo bar 1 U test2.patch: applying test2.patch -Now at: test2.patch +now at: test2.patch % qapplied test.patch test2.patch @@ -138,11 +138,11 @@ % qprev test.patch % qnext -All patches applied +all patches applied % pop, qnext, qprev, qapplied -Now at: test.patch +now at: test.patch test2.patch -Only one patch applied +only one patch applied test.patch % commit should fail abort: cannot commit over an applied mq patch @@ -155,19 +155,19 @@ test2.patch % qpush/qpop with index applying test2.patch -Now at: test2.patch -Now at: test.patch +now at: test2.patch +now at: test.patch applying test1b.patch -Now at: test1b.patch +now at: test1b.patch applying test2.patch -Now at: test2.patch -Now at: test1b.patch -Now at: test.patch +now at: test2.patch +now at: test1b.patch +now at: test.patch applying test1b.patch applying test2.patch -Now at: test2.patch +now at: test2.patch % push should succeed -Patch queue now empty +patch queue now empty pushing to ../../k searching for changes adding changesets @@ -178,9 +178,9 @@ applying test.patch applying test1b.patch applying test2.patch -Now at: test2.patch +now at: test2.patch % pops all patches and succeeds -Patch queue now empty +patch queue now empty qpop -a succeeds % does nothing and succeeds no patches applied @@ -190,15 +190,15 @@ qpop fails % pushes a patch and succeeds applying test.patch -Now at: test.patch +now at: test.patch qpush succeeds % pops a patch and succeeds -Patch queue now empty +patch queue now empty qpop succeeds % pushes up to test1b.patch and succeeds applying test.patch applying test1b.patch -Now at: test1b.patch +now at: test1b.patch qpush test1b.patch succeeds % does nothing and succeeds qpush: test1b.patch is already at the top @@ -213,12 +213,12 @@ abort: patch test2.patch is not applied qpop test2.patch fails % pops up to test.patch and succeeds -Now at: test.patch +now at: test.patch qpop test.patch succeeds % pushes all patches and succeeds applying test1b.patch applying test2.patch -Now at: test2.patch +now at: test2.patch qpush -a succeeds % does nothing and succeeds all patches are currently applied @@ -269,14 +269,14 @@ +f M a % qpush failure -Patch queue now empty +patch queue now empty applying foo applying bar file foo already exists 1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir -Errors during apply, please fix and refresh bar +errors during apply, please fix and refresh bar ? foo ? foo.rej % mq tags @@ -284,7 +284,7 @@ 1 qbase foo 2 qtip bar tip % bad node in status -Now at: foo +now at: foo changeset: 0:cb9a9f314b8b mq status file refers to unknown node tag: tip @@ -294,7 +294,7 @@ mq status file refers to unknown node default 0:cb9a9f314b8b -abort: working directory revision is not qtip +abort: trying to pop unknown node new file diff --git a/new b/new @@ -308,9 +308,9 @@ diff --git a/new b/copy copy from new copy to copy -Now at: new +now at: new applying copy -Now at: copy +now at: copy diff --git a/new b/copy copy from new copy to copy @@ -325,10 +325,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -Patch queue now empty +patch queue now empty (working directory not at tip) applying bar -Now at: bar +now at: bar diff --git a/bar b/bar new file mode 100644 --- /dev/null @@ -359,10 +359,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -Patch queue now empty +patch queue now empty (working directory not at tip) applying bar -Now at: bar +now at: bar diff --git a/foo b/bleh rename from foo rename to bleh @@ -386,16 +386,16 @@ % refresh omitting an added file C newfile A newfile -Now at: bar +now at: bar % create a git patch diff --git a/alexander b/alexander % create a git binary patch 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus diff --git a/bucephalus b/bucephalus % check binary patches can be popped and pushed -Now at: addalexander +now at: addalexander applying addbucephalus -Now at: addbucephalus +now at: addbucephalus 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus % strip again 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -461,7 +461,7 @@ rev 0: add foo patch repo: rev 0: checkpoint -Patch queue now empty +patch queue now empty main repo: rev 0: add foo patch repo: @@ -475,21 +475,19 @@ rev 0: checkpoint % test applying on an empty file (issue 1033) adding a -Patch queue now empty +patch queue now empty applying changea -Now at: changea +now at: changea % test qpush with --force, issue1087 adding bye.txt adding hello.txt -Patch queue now empty +patch queue now empty % qpush should fail, local changes abort: local changes found, refresh first % apply force, should not discard changes with empty patch applying empty -patch: **** Only garbage was found in the patch input. -patch failed, unable to continue (try -v) patch empty is empty -Now at: empty +now at: empty diff -r bf5fc3f07a0a hello.txt --- a/hello.txt +++ b/hello.txt @@ -512,12 +510,12 @@ summary: imported patch empty -Patch queue now empty +patch queue now empty % qpush should fail, local changes abort: local changes found, refresh first % apply force, should discard changes in hello, but not bye applying empty -Now at: empty +now at: empty M bye.txt diff -r ba252371dbc1 bye.txt --- a/bye.txt @@ -538,3 +536,7 @@ hello +world +universe +% test popping revisions not in working dir ancestry +0 A empty +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +patch queue now empty
--- a/tests/test-newbranch Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-newbranch Fri Feb 27 08:13:42 2009 -0600 @@ -1,6 +1,6 @@ #!/bin/sh -branchcache=.hg/branch.cache +branchcache=.hg/branchheads.cache hg init t cd t
--- a/tests/test-newbranch.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-newbranch.out Fri Feb 27 08:13:42 2009 -0600 @@ -81,6 +81,7 @@ 4:4909a3732169 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 +be8523e69bf892e25817fc97187516b3c0804ae4 default bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo 67ec16bde7f1575d523313b9bca000f6a6f12dca bar @@ -90,6 +91,7 @@ be8523e69bf892e25817fc97187516b3c0804ae4 default % pushing everything 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 +be8523e69bf892e25817fc97187516b3c0804ae4 default bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo 67ec16bde7f1575d523313b9bca000f6a6f12dca bar
--- a/tests/test-notify Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-notify Fri Feb 27 08:13:42 2009 -0600 @@ -84,3 +84,17 @@ hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \ -e 's/^Date:.*/Date:/' + +echo % test merge +cd a +hg up -C 0 +echo a >> a +hg ci -Am adda2 -d '2 0' +hg merge +hg ci -m merge -d '3 0' +cd .. + +hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ + -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \ + -e 's/^Date:.*/Date:/' +
--- a/tests/test-notify.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-notify.out Fri Feb 27 08:13:42 2009 -0600 @@ -152,7 +152,8 @@ b diffstat: -files patched: 1 + a | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (6 lines): @@ -163,3 +164,56 @@ a +a (run 'hg update' to get a working copy) +% test merge +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +pulling from ../a +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 0 changes to 1 files +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Test: foo +Date: +Subject: adda2 +From: test@test.com +X-Hg-Notification: changeset 0a184ce6067f +Message-Id: +To: baz@test.com, foo@bar + +changeset 0a184ce6067f +description: + adda2 +diffstat: + + a | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diffs (6 lines): + +diff -r cb9a9f314b8b -r 0a184ce6067f a +--- a/a Thu Jan 01 00:00:00 1970 +0000 ++++ b/a Thu Jan 01 00:00:02 1970 +0000 +@@ -1,1 +1,2 @@ + a ++a +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Test: foo +Date: +Subject: merge +From: test@test.com +X-Hg-Notification: changeset 22c88b85aa27 +Message-Id: +To: baz@test.com, foo@bar + +changeset 22c88b85aa27 +description: + merge +(run 'hg update' to get a working copy)
--- a/tests/test-patchbomb Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-patchbomb Fri Feb 27 08:13:42 2009 -0600 @@ -11,6 +11,8 @@ echo "[extensions]" >> $HGRCPATH echo "patchbomb=" >> $HGRCPATH +COLUMNS=80; export COLUMNS + hg init t cd t echo a > a
--- a/tests/test-patchbomb.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-patchbomb.out Fri Feb 27 08:13:42 2009 -0600 @@ -196,7 +196,8 @@ c -files patched: 1 + c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) Displaying [PATCH] test ... @@ -211,7 +212,8 @@ To: foo Cc: bar -files patched: 1 + c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) # HG changeset patch @@ -232,15 +234,19 @@ a -files patched: 1 + a | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) b -files patched: 1 + b | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) Final summary: -files patched: 2 + a | 1 + + b | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) Write the introductory message for the patch series. @@ -258,7 +264,9 @@ Cc: bar -files patched: 2 + a | 1 + + b | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) Displaying [PATCH 1 of 2] a ... Content-Type: text/plain; charset="us-ascii" @@ -274,7 +282,8 @@ To: foo Cc: bar -files patched: 1 + a | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) # HG changeset patch @@ -304,7 +313,8 @@ To: foo Cc: bar -files patched: 1 + b | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) # HG changeset patch
--- a/tests/test-pull-http Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-pull-http Fri Feb 27 08:13:42 2009 -0600 @@ -19,7 +19,7 @@ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log cat hg.pid >> $DAEMON_PIDS hg clone http://localhost:$HGPORT/ test3 | sed -e 's,:[0-9][0-9]*/,/,' -kill `cat hg.pid` +"$TESTDIR/killdaemons.py" echo % serve errors cat errors.log
--- a/tests/test-rebase-pull Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-rebase-pull Fri Feb 27 08:13:42 2009 -0600 @@ -25,6 +25,9 @@ cd .. hg clone a b +# This is needed to test pull --rebase +hg clone a c + cd b addcommit "L1" 2 @@ -44,7 +47,15 @@ hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' echo -echo "% Invoke pull --rebase with --update" -hg pull --rebase --update +echo "% Invoke pull --rebase and nothing to rebase" +cd ../c +hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' +hg glog --template '{rev}\n' -l 1 + +echo +echo "% pull --rebase doesn't update if nothing has been pulled" +hg up 1 +hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' +hg glog --template '{rev}\n' -l 1 exit 0
--- a/tests/test-rebase-pull.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-rebase-pull.out Fri Feb 27 08:13:42 2009 -0600 @@ -1,3 +1,5 @@ +updating working directory +2 files updated, 0 files merged, 0 files removed, 0 files unresolved updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -30,5 +32,22 @@ searching for changes no changes found -% Invoke pull --rebase with --update -abort: --update and --rebase are not compatible +% Invoke pull --rebase and nothing to rebase +pulling from +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) +nothing to rebase +@ 2 +| + +% pull --rebase doesn't update if nothing has been pulled +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +pulling from +searching for changes +no changes found +o 2 +|
--- a/tests/test-record Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-record Fri Feb 27 08:13:42 2009 -0600 @@ -264,3 +264,35 @@ f EOF echo; hg tip -p + +echo % preserve chmod +x + +chmod +x f1 +echo a >> f1 +hg record -d '20 0' -mz <<EOF +y +y +y +EOF +echo; hg tip --config diff.git=True -p + +echo % preserve execute permission on original + +echo b >> f1 +hg record -d '21 0' -maa <<EOF +y +y +y +EOF +echo; hg tip --config diff.git=True -p + +echo % preserve chmod -x + +chmod -x f1 +echo c >> f1 +hg record -d '22 0' -mab <<EOF +y +y +y +EOF +echo; hg tip --config diff.git=True -p
--- a/tests/test-record.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-record.out Fri Feb 27 08:13:42 2009 -0600 @@ -27,13 +27,14 @@ options: - -A --addremove mark new/missing files as added/removed before committing - -I --include include names matching the given patterns - -X --exclude exclude names matching the given patterns - -m --message use <text> as commit message - -l --logfile read commit message from <file> - -d --date record datecode as commit date - -u --user record user as committer + -A --addremove mark new/missing files as added/removed before committing + --close-branch mark a branch as closed, hiding it from the branch list + -I --include include names matching the given patterns + -X --exclude exclude names matching the given patterns + -m --message use <text> as commit message + -l --logfile read commit message from <file> + -d --date record datecode as commit date + -u --user record user as committer use "hg -v help record" to show global options % select no files @@ -493,3 +494,81 @@ a +a +% preserve chmod +x +diff --git a/subdir/f1 b/subdir/f1 +old mode 100644 +new mode 100755 +1 hunks, 1 lines changed +examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,2 +1,3 @@ + a + a ++a +record this change to 'subdir/f1'? [Ynsfdaq?] +changeset: 22:a891589cb933 +tag: tip +user: test +date: Thu Jan 01 00:00:20 1970 +0000 +summary: z + +diff --git a/subdir/f1 b/subdir/f1 +old mode 100644 +new mode 100755 +--- a/subdir/f1 ++++ b/subdir/f1 +@@ -1,2 +1,3 @@ + a + a ++a + +% preserve execute permission on original +diff --git a/subdir/f1 b/subdir/f1 +1 hunks, 1 lines changed +examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,3 +1,4 @@ + a + a + a ++b +record this change to 'subdir/f1'? [Ynsfdaq?] +changeset: 23:befa0dae6201 +tag: tip +user: test +date: Thu Jan 01 00:00:21 1970 +0000 +summary: aa + +diff --git a/subdir/f1 b/subdir/f1 +--- a/subdir/f1 ++++ b/subdir/f1 +@@ -1,3 +1,4 @@ + a + a + a ++b + +% preserve chmod -x +diff --git a/subdir/f1 b/subdir/f1 +old mode 100755 +new mode 100644 +1 hunks, 1 lines changed +examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -2,3 +2,4 @@ + a + a + b ++c +record this change to 'subdir/f1'? [Ynsfdaq?] +changeset: 24:8fd83ff53ce6 +tag: tip +user: test +date: Thu Jan 01 00:00:22 1970 +0000 +summary: ab + +diff --git a/subdir/f1 b/subdir/f1 +old mode 100755 +new mode 100644 +--- a/subdir/f1 ++++ b/subdir/f1 +@@ -2,3 +2,4 @@ + a + a + b ++c +
--- a/tests/test-rename-merge2.out Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-rename-merge2.out Fri Feb 27 08:13:42 2009 -0600 @@ -484,6 +484,7 @@ searching for copies back to rev 1 local changed a which remote deleted use (c)hanged version or (d)elete? c + a: prompt keep -> a b: versions differ -> m rev: versions differ -> m preserving b for resolve of b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-resolve Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,27 @@ +#!/bin/sh + +# test that a commit clears the merge state. + +hg init repo +cd repo + +echo foo > file +hg commit -Am 'add file' -d '0 0' + +echo bar >> file +hg commit -Am 'append bar' -d '0 0' + +echo % create a second head +hg up -C 0 +echo baz >> file +hg commit -Am 'append baz' -d '0 0' + +echo % failing merge +HGMERGE=internal:fail hg merge + +echo resolved > file +hg resolve -m file +hg commit -m 'resolved' -d '0 0' + +echo % resolve -l, should be empty +hg resolve -l
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-resolve.out Fri Feb 27 08:13:42 2009 -0600 @@ -0,0 +1,8 @@ +adding file +% create a second head +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +% failing merge +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +% resolve -l, should be empty
--- a/tests/test-walkrepo.py Sun Jan 25 19:15:49 2009 +0100 +++ b/tests/test-walkrepo.py Fri Feb 27 08:13:42 2009 -0600 @@ -24,26 +24,26 @@ reposet = frozenset(walkrepos('.', followsym=True)) if sym and (len(reposet) != 3): print "reposet = %r" % (reposet,) - raise SystemExit(1, "Found %d repositories when I should have found 3" % (len(reposet),)) + print "Found %d repositories when I should have found 3" % (len(reposet),) if (not sym) and (len(reposet) != 2): print "reposet = %r" % (reposet,) - raise SystemExit(1, "Found %d repositories when I should have found 2" % (len(reposet),)) + print "Found %d repositories when I should have found 2" % (len(reposet),) sub1set = frozenset((pjoin('.', 'sub1'), pjoin('.', 'circle', 'subdir', 'sub1'))) if len(sub1set & reposet) != 1: print "sub1set = %r" % (sub1set,) print "reposet = %r" % (reposet,) - raise SystemExit(1, "sub1set and reposet should have exactly one path in common.") + print "sub1set and reposet should have exactly one path in common." sub2set = frozenset((pjoin('.', 'subsub1'), pjoin('.', 'subsubdir', 'subsub1'))) if len(sub2set & reposet) != 1: print "sub2set = %r" % (sub2set,) print "reposet = %r" % (reposet,) - raise SystemExit(1, "sub1set and reposet should have exactly one path in common.") + print "sub1set and reposet should have exactly one path in common." sub3 = pjoin('.', 'circle', 'top1') if sym and not (sub3 in reposet): print "reposet = %r" % (reposet,) - raise SystemExit(1, "Symbolic links are supported and %s is not in reposet" % (sub3,)) + print "Symbolic links are supported and %s is not in reposet" % (sub3,) runtest() if sym: