mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
merge with i18n
This commit is contained in:
Alexander Sauta
commit
ffd3e9a4f6
1
.hgsigs
1
.hgsigs
@ -91,3 +91,4 @@ b96cb15ec9e04d8ac5ee08b34fcbbe4200588965 0 iQIVAwUAUxJPlyBXgaxoKi1yAQLIRA//Qh9qz
|
||||
269c80ee5b3cb3684fa8edc61501b3506d02eb10 0 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
|
||||
|
||||
@ -127,7 +127,8 @@ class convert_git(converter_source):
|
||||
size = int(info[2])
|
||||
data = self.catfilepipe[1].read(size)
|
||||
if len(data) < size:
|
||||
raise util.Abort(_('cannot read %r object at %s: %s') % (type, rev))
|
||||
raise util.Abort(_('cannot read %r object at %s: unexpected size')
|
||||
% (type, rev))
|
||||
# read the trailing newline
|
||||
self.catfilepipe[1].read(1)
|
||||
return data
|
||||
|
||||
@ -19,7 +19,7 @@ testedwith = 'internal'
|
||||
@command('fetch',
|
||||
[('r', 'rev', [],
|
||||
_('a specific revision you would like to pull'), _('REV')),
|
||||
('e', 'edit', None, _('edit commit message')),
|
||||
('e', 'edit', None, _('invoke editor on commit messages')),
|
||||
('', 'force-editor', None, _('edit commit message (DEPRECATED)')),
|
||||
('', 'switch-parent', None, _('switch parents when merging')),
|
||||
] + commands.commitopts + commands.commitopts2 + commands.remoteopts,
|
||||
|
||||
@ -203,7 +203,7 @@ def keystr(ui, key):
|
||||
('k', 'key', '',
|
||||
_('the key id to sign with'), _('ID')),
|
||||
('m', 'message', '',
|
||||
_('commit message'), _('TEXT')),
|
||||
_('use text as commit message'), _('TEXT')),
|
||||
('e', 'edit', False, _('invoke editor on commit messages')),
|
||||
] + commands.commitopts2,
|
||||
_('hg sign [OPTION]... [REV]...'))
|
||||
|
||||
@ -158,6 +158,7 @@ from mercurial import context
|
||||
from mercurial import hg
|
||||
from mercurial import node
|
||||
from mercurial import repair
|
||||
from mercurial import scmutil
|
||||
from mercurial import util
|
||||
from mercurial import obsolete
|
||||
from mercurial import merge as mergemod
|
||||
@ -567,11 +568,11 @@ def _histedit(ui, repo, *freeargs, **opts):
|
||||
remote = None
|
||||
root = findoutgoing(ui, repo, remote, force, opts)
|
||||
else:
|
||||
rootrevs = list(repo.set('roots(%lr)', revs))
|
||||
if len(rootrevs) != 1:
|
||||
rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs)))
|
||||
if len(rr) != 1:
|
||||
raise util.Abort(_('The specified revisions must have '
|
||||
'exactly one common root'))
|
||||
root = rootrevs[0].node()
|
||||
root = rr[0].node()
|
||||
|
||||
keep = opts.get('keep', False)
|
||||
revs = between(repo, root, topmost, keep)
|
||||
|
||||
18
hgext/mq.py
18
hgext/mq.py
@ -1995,12 +1995,12 @@ class queue(object):
|
||||
self.added.append(patchname)
|
||||
imported.append(patchname)
|
||||
patchname = None
|
||||
if rev and repo.ui.configbool('mq', 'secret', False):
|
||||
# if we added anything with --rev, we must move the secret root
|
||||
phases.retractboundary(repo, phases.secret, [n])
|
||||
self.parseseries()
|
||||
self.applieddirty = True
|
||||
self.seriesdirty = True
|
||||
if rev and repo.ui.configbool('mq', 'secret', False):
|
||||
# if we added anything with --rev, move the secret root
|
||||
phases.retractboundary(repo, phases.secret, [n])
|
||||
self.parseseries()
|
||||
self.applieddirty = True
|
||||
self.seriesdirty = True
|
||||
|
||||
for i, filename in enumerate(files):
|
||||
if existing:
|
||||
@ -2407,7 +2407,7 @@ def setupheaderopts(ui, opts):
|
||||
opts['date'] = "%d %d" % util.makedate()
|
||||
|
||||
@command("^qnew",
|
||||
[('e', 'edit', None, _('edit commit message')),
|
||||
[('e', 'edit', None, _('invoke editor on commit messages')),
|
||||
('f', 'force', None, _('import uncommitted changes (DEPRECATED)')),
|
||||
('g', 'git', None, _('use git extended diff format')),
|
||||
('U', 'currentuser', None, _('add "From: <current user>" to patch')),
|
||||
@ -2453,7 +2453,7 @@ def new(ui, repo, patch, *args, **opts):
|
||||
return 0
|
||||
|
||||
@command("^qrefresh",
|
||||
[('e', 'edit', None, _('edit commit message')),
|
||||
[('e', 'edit', None, _('invoke editor on commit messages')),
|
||||
('g', 'git', None, _('use git extended diff format')),
|
||||
('s', 'short', None,
|
||||
_('refresh only files already in the patch and specified files')),
|
||||
@ -2523,7 +2523,7 @@ def diff(ui, repo, *pats, **opts):
|
||||
return 0
|
||||
|
||||
@command('qfold',
|
||||
[('e', 'edit', None, _('edit patch header')),
|
||||
[('e', 'edit', None, _('invoke editor on commit messages')),
|
||||
('k', 'keep', None, _('keep folded patch files')),
|
||||
] + commands.commitopts,
|
||||
_('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...'))
|
||||
|
||||
1083
i18n/ja.po
1083
i18n/ja.po
File diff suppressed because it is too large
Load Diff
@ -2662,8 +2662,8 @@ msgid "cannot read %r object at %s"
|
||||
msgstr "não é possível ler objeto %r em %s"
|
||||
|
||||
#, python-format
|
||||
msgid "cannot read %r object at %s: %s"
|
||||
msgstr "não é possível ler objeto %r em %s: %s"
|
||||
msgid "cannot read %r object at %s: unexpected size"
|
||||
msgstr "não é possível ler objeto %r em %s: tamanho inesperado"
|
||||
|
||||
#, python-format
|
||||
msgid "cannot read submodules config file in %s"
|
||||
@ -3424,8 +3424,8 @@ msgstr "pull, update e merge em um comando (OBSOLETA)"
|
||||
msgid "a specific revision you would like to pull"
|
||||
msgstr "uma revisão específica que você gostaria de trazer"
|
||||
|
||||
msgid "edit commit message"
|
||||
msgstr "editar mensagem de consolidação"
|
||||
msgid "invoke editor on commit messages"
|
||||
msgstr "chama um editor para mensagens de consolidação"
|
||||
|
||||
msgid "edit commit message (DEPRECATED)"
|
||||
msgstr "editar mensagem de consolidação (OBSOLETO)"
|
||||
@ -3586,11 +3586,8 @@ msgstr "o id da chave com a qual assinar"
|
||||
msgid "TEXT"
|
||||
msgstr "TEXTO"
|
||||
|
||||
msgid "commit message"
|
||||
msgstr "mensagem de consolidação"
|
||||
|
||||
msgid "invoke editor on commit messages"
|
||||
msgstr "chama um editor para mensagens de consolidação"
|
||||
msgid "use text as commit message"
|
||||
msgstr "usa o texto como mensagem de consolidação"
|
||||
|
||||
msgid "hg sign [OPTION]... [REV]..."
|
||||
msgstr "hg sign [OPÇÃO]... [REV]..."
|
||||
@ -6467,9 +6464,6 @@ msgstr ""
|
||||
" mudanças feitas pelo patch atual sem incluir as mudanças feitas\n"
|
||||
" desde o último qrefresh."
|
||||
|
||||
msgid "edit patch header"
|
||||
msgstr "edita o cabeçalho do patch"
|
||||
|
||||
msgid "keep folded patch files"
|
||||
msgstr "mantém os arquivos dos patches incorporados"
|
||||
|
||||
@ -10379,9 +10373,6 @@ msgstr "inclui nomes que casem com os padrões fornecidos"
|
||||
msgid "exclude names matching the given patterns"
|
||||
msgstr "exclui nomes que casem com os padrões fornecidos"
|
||||
|
||||
msgid "use text as commit message"
|
||||
msgstr "usa o texto como mensagem de consolidação"
|
||||
|
||||
msgid "read commit message from file"
|
||||
msgstr "lê de um arquivo a mensagem de consolidação"
|
||||
|
||||
@ -11680,9 +11671,6 @@ msgstr "emenda o pai do diretório de trabalho"
|
||||
msgid "use the secret phase for committing"
|
||||
msgstr "consolida a revisão na fase \"secret\""
|
||||
|
||||
msgid "further edit commit message already specified"
|
||||
msgstr "edita a mensagem de consolidação especificada"
|
||||
|
||||
msgid "commit the specified files or all outstanding changes"
|
||||
msgstr "consolida os arquivos pedidos ou todas as mudanças por gravar"
|
||||
|
||||
@ -13378,6 +13366,9 @@ msgstr "aplicando patch da entrada padrão\n"
|
||||
msgid "patch applied partially\n"
|
||||
msgstr "o patch foi aplicado parcialmente\n"
|
||||
|
||||
msgid "(fix the .rej files and run `hg commit --amend`)\n"
|
||||
msgstr "(corrija os arquivos .rej e execute `hg commit --amend`)\n"
|
||||
|
||||
#, python-format
|
||||
msgid "%s: no diffs found"
|
||||
msgstr "%s: nenhum diff encontrado"
|
||||
@ -15053,9 +15044,6 @@ msgstr "revisão a receber a etiqueta"
|
||||
msgid "remove a tag"
|
||||
msgstr "remove uma etiqueta"
|
||||
|
||||
msgid "use <text> as commit message"
|
||||
msgstr "usa <texto> como mensagem de consolidação"
|
||||
|
||||
msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
|
||||
msgstr "[-f] [-l] [-m TEXTO] [-d DATA] [-u USUÁRIO] [-r REV] NOME..."
|
||||
|
||||
@ -26722,9 +26710,11 @@ msgstr "strip espera um ou dois argumentos"
|
||||
msgid "sub expects three arguments"
|
||||
msgstr "sub espera três argumentos"
|
||||
|
||||
#. i18n: "startswith" is a keyword
|
||||
msgid "startswith expects two arguments"
|
||||
msgstr "startswith espera dois argumentos"
|
||||
|
||||
#. i18n: "word" is a keyword
|
||||
#, python-format
|
||||
msgid "word expects two or three arguments, got %d"
|
||||
msgstr "word espera dois ou três argumentos, %d recebidos"
|
||||
|
||||
@ -1629,7 +1629,7 @@ def _makelogrevset(repo, pats, opts, revs):
|
||||
|
||||
filematcher = None
|
||||
if opts.get('patch') or opts.get('stat'):
|
||||
if follow:
|
||||
if follow and not match.always():
|
||||
# _makelogfilematcher expects its files argument to be relative to
|
||||
# the repo root, so use match.files(), not pats.
|
||||
filematcher = _makelogfilematcher(repo, match.files(), followfirst)
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
from node import hex, bin, nullid, nullrev, short
|
||||
from lock import release
|
||||
from i18n import _
|
||||
import os, re, difflib, time, tempfile, errno
|
||||
import os, re, difflib, time, tempfile, errno, shlex
|
||||
import sys
|
||||
import hg, scmutil, util, revlog, copies, error, bookmarks
|
||||
import patch, help, encoding, templatekw, discovery
|
||||
@ -1339,8 +1339,7 @@ def clone(ui, source, dest=None, **opts):
|
||||
_('mark a branch as closed, hiding it from the branch list')),
|
||||
('', 'amend', None, _('amend the parent of the working dir')),
|
||||
('s', 'secret', None, _('use the secret phase for committing')),
|
||||
('e', 'edit', None,
|
||||
_('further edit commit message already specified')),
|
||||
('e', 'edit', None, _('invoke editor on commit messages')),
|
||||
] + walkopts + commitopts + commitopts2 + subrepoopts,
|
||||
_('[OPTION]... [FILE]...'),
|
||||
inferrepo=True)
|
||||
@ -2248,7 +2247,7 @@ def debuginstall(ui):
|
||||
# editor
|
||||
ui.status(_("checking commit editor...\n"))
|
||||
editor = ui.geteditor()
|
||||
cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
|
||||
cmdpath = util.findexe(shlex.split(editor)[0])
|
||||
if not cmdpath:
|
||||
if editor == 'vi':
|
||||
ui.write(_(" No commit editor set and can't find vi in PATH\n"))
|
||||
@ -3883,8 +3882,8 @@ def import_(ui, repo, patch1=None, *patches, **opts):
|
||||
parents = [repo[node]]
|
||||
if rej:
|
||||
ui.write_err(_("patch applied partially\n"))
|
||||
ui.write_err(("(fix the .rej files and run "
|
||||
"`hg commit --amend`)\n"))
|
||||
ui.write_err(_("(fix the .rej files and run "
|
||||
"`hg commit --amend`)\n"))
|
||||
ret = 1
|
||||
break
|
||||
|
||||
@ -5695,8 +5694,8 @@ def summary(ui, repo, **opts):
|
||||
('r', 'rev', '', _('revision to tag'), _('REV')),
|
||||
('', 'remove', None, _('remove a tag')),
|
||||
# -l/--local is already there, commitopts cannot be used
|
||||
('e', 'edit', None, _('edit commit message')),
|
||||
('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
|
||||
('e', 'edit', None, _('invoke editor on commit messages')),
|
||||
('m', 'message', '', _('use text as commit message'), _('TEXT')),
|
||||
] + commitopts2,
|
||||
_('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
|
||||
def tag(ui, repo, name1, *names, **opts):
|
||||
|
||||
@ -120,7 +120,7 @@ class basectx(object):
|
||||
mf2 = self._manifestmatches(match, s)
|
||||
|
||||
modified, added, clean = [], [], []
|
||||
deleted, unknown, ignored = s[3], [], []
|
||||
deleted, unknown, ignored = s[3], s[4], s[5]
|
||||
withflags = mf1.withflags() | mf2.withflags()
|
||||
for fn, mf2node in mf2.iteritems():
|
||||
if fn in mf1:
|
||||
@ -135,6 +135,10 @@ class basectx(object):
|
||||
elif fn not in deleted:
|
||||
added.append(fn)
|
||||
removed = mf1.keys()
|
||||
if removed:
|
||||
# need to filter files if they are already reported as removed
|
||||
unknown = [fn for fn in unknown if fn not in mf1]
|
||||
ignored = [fn for fn in ignored if fn not in mf1]
|
||||
|
||||
return [modified, added, removed, deleted, unknown, ignored, clean]
|
||||
|
||||
@ -316,7 +320,8 @@ class basectx(object):
|
||||
listunknown)
|
||||
|
||||
if reversed:
|
||||
r[1], r[2], r[3], r[4] = r[2], r[1], r[4], r[3]
|
||||
# reverse added and removed
|
||||
r[1], r[2] = r[2], r[1]
|
||||
|
||||
if listsubrepos:
|
||||
for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
|
||||
|
||||
@ -766,7 +766,7 @@ def _dispatch(req):
|
||||
if options['version']:
|
||||
return commands.version_(ui)
|
||||
if options['help']:
|
||||
return commands.help_(ui, cmd)
|
||||
return commands.help_(ui, cmd, command=True)
|
||||
elif not cmd:
|
||||
return commands.help_(ui, 'shortlist')
|
||||
|
||||
|
||||
@ -468,6 +468,7 @@ def sub(context, mapping, args):
|
||||
|
||||
def startswith(context, mapping, args):
|
||||
if len(args) != 2:
|
||||
# i18n: "startswith" is a keyword
|
||||
raise error.ParseError(_("startswith expects two arguments"))
|
||||
|
||||
patn = stringify(args[0][0](context, mapping, args[0][1]))
|
||||
@ -480,6 +481,7 @@ def startswith(context, mapping, args):
|
||||
def word(context, mapping, args):
|
||||
"""return nth word from a string"""
|
||||
if not (2 <= len(args) <= 3):
|
||||
# i18n: "word" is a keyword
|
||||
raise error.ParseError(_("word expects two or three arguments, got %d")
|
||||
% len(args))
|
||||
|
||||
|
||||
@ -437,7 +437,7 @@ class ui(object):
|
||||
"""
|
||||
user = os.environ.get("HGUSER")
|
||||
if user is None:
|
||||
user = self.config("ui", "username")
|
||||
user = self.config("ui", ["username", "user"])
|
||||
if user is not None:
|
||||
user = os.path.expandvars(user)
|
||||
if user is None:
|
||||
|
||||
@ -8,6 +8,15 @@ Create an extension to test bundle2 API
|
||||
> code. We still need to be able to test it while it grow up.
|
||||
> """
|
||||
>
|
||||
> import sys, os
|
||||
> from mercurial import cmdutil
|
||||
> from mercurial import util
|
||||
> from mercurial import bundle2
|
||||
> from mercurial import scmutil
|
||||
> from mercurial import discovery
|
||||
> from mercurial import changegroup
|
||||
> from mercurial import error
|
||||
>
|
||||
> try:
|
||||
> import msvcrt
|
||||
> msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
|
||||
@ -16,14 +25,6 @@ Create an extension to test bundle2 API
|
||||
> except ImportError:
|
||||
> pass
|
||||
>
|
||||
> import sys
|
||||
> from mercurial import cmdutil
|
||||
> from mercurial import util
|
||||
> from mercurial import bundle2
|
||||
> from mercurial import scmutil
|
||||
> from mercurial import discovery
|
||||
> from mercurial import changegroup
|
||||
> from mercurial import error
|
||||
> cmdtable = {}
|
||||
> command = cmdutil.command(cmdtable)
|
||||
>
|
||||
|
||||
@ -52,15 +52,34 @@
|
||||
abort: no username supplied
|
||||
(use "hg config --edit" to set your username)
|
||||
[255]
|
||||
|
||||
# test alternate config var
|
||||
|
||||
$ echo 1234 > asdf
|
||||
$ echo "[ui]" > .hg/hgrc
|
||||
$ echo "user = Foo Bar II <foo2@bar.com>" >> .hg/hgrc
|
||||
$ hg commit -m commit-1
|
||||
$ hg tip
|
||||
changeset: 4:6f24bfb4c617
|
||||
tag: tip
|
||||
user: Foo Bar II <foo2@bar.com>
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-1
|
||||
|
||||
# test no .hg/hgrc (uses generated non-interactive username)
|
||||
|
||||
$ echo space > asdf
|
||||
$ rm .hg/hgrc
|
||||
$ hg commit -m commit-1 2>&1
|
||||
no username found, using '[^']*' instead (re)
|
||||
|
||||
$ echo space > asdf
|
||||
$ echo space2 > asdf
|
||||
$ hg commit -u ' ' -m commit-1
|
||||
transaction abort!
|
||||
rollback completed
|
||||
abort: empty username!
|
||||
[255]
|
||||
|
||||
# don't add tests here, previous test is unstable
|
||||
|
||||
$ cd ..
|
||||
|
||||
@ -862,6 +862,17 @@ test deprecated option is hidden with translation with untranslated description
|
||||
*"hg -v help debugoptDEP"* (glob)
|
||||
#endif
|
||||
|
||||
Test commands that collide with topics (issue4240)
|
||||
|
||||
$ hg config -hq
|
||||
hg config [-u] [NAME]...
|
||||
|
||||
show combined config settings from all hgrc files
|
||||
$ hg showconfig -hq
|
||||
hg config [-u] [NAME]...
|
||||
|
||||
show combined config settings from all hgrc files
|
||||
|
||||
Test a help topic
|
||||
|
||||
$ hg help revs
|
||||
|
||||
@ -324,6 +324,30 @@ try with --rev
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: a
|
||||
|
||||
Verify that revsetalias entries work with histedit:
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [revsetalias]
|
||||
> grandparent(ARG) = p1(p1(ARG))
|
||||
> EOF
|
||||
$ echo extra commit >> c
|
||||
$ hg ci -m 'extra commit to c'
|
||||
$ HGEDITOR=cat hg histedit 'grandparent(.)'
|
||||
pick ece0b8d93dda 6 c
|
||||
pick 803ef1c6fcfd 7 e
|
||||
pick 9c863c565126 8 extra commit to c
|
||||
|
||||
# Edit history between ece0b8d93dda and 9c863c565126
|
||||
#
|
||||
# Commits are listed from least to most recent
|
||||
#
|
||||
# Commands:
|
||||
# p, pick = use commit
|
||||
# e, edit = use commit, but stop for amending
|
||||
# f, fold = use commit, but combine it with the one above
|
||||
# d, drop = remove commit from history
|
||||
# m, mess = edit message without changing commit content
|
||||
#
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
|
||||
should also work if a commit message is missing
|
||||
$ BUNDLE="$TESTDIR/missing-comment.hg"
|
||||
|
||||
@ -260,6 +260,98 @@ log -pf b inside dir
|
||||
+a
|
||||
|
||||
|
||||
log -pf, but no args
|
||||
|
||||
$ hg log -pf
|
||||
changeset: 3:2ca5ba701980
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:04 1970 +0000
|
||||
summary: d
|
||||
|
||||
diff -r f8954cd4dc1f -r 2ca5ba701980 a
|
||||
--- a/a Thu Jan 01 00:00:03 1970 +0000
|
||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
@@ -1,1 +0,0 @@
|
||||
-a
|
||||
diff -r f8954cd4dc1f -r 2ca5ba701980 b
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/b Thu Jan 01 00:00:04 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+a
|
||||
diff -r f8954cd4dc1f -r 2ca5ba701980 d
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/d Thu Jan 01 00:00:04 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+a
|
||||
diff -r f8954cd4dc1f -r 2ca5ba701980 g
|
||||
--- a/g Thu Jan 01 00:00:03 1970 +0000
|
||||
+++ b/g Thu Jan 01 00:00:04 1970 +0000
|
||||
@@ -1,2 +1,2 @@
|
||||
f
|
||||
-g
|
||||
+f
|
||||
|
||||
changeset: 2:f8954cd4dc1f
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:03 1970 +0000
|
||||
summary: c
|
||||
|
||||
diff -r d89b0a12d229 -r f8954cd4dc1f b
|
||||
--- a/b Thu Jan 01 00:00:02 1970 +0000
|
||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
@@ -1,1 +0,0 @@
|
||||
-a
|
||||
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+a
|
||||
diff -r d89b0a12d229 -r f8954cd4dc1f f
|
||||
--- a/f Thu Jan 01 00:00:02 1970 +0000
|
||||
+++ b/f Thu Jan 01 00:00:03 1970 +0000
|
||||
@@ -1,1 +1,2 @@
|
||||
f
|
||||
+f
|
||||
diff -r d89b0a12d229 -r f8954cd4dc1f g
|
||||
--- a/g Thu Jan 01 00:00:02 1970 +0000
|
||||
+++ b/g Thu Jan 01 00:00:03 1970 +0000
|
||||
@@ -1,1 +1,2 @@
|
||||
f
|
||||
+g
|
||||
|
||||
changeset: 1:d89b0a12d229
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:02 1970 +0000
|
||||
summary: b
|
||||
|
||||
diff -r 9161b9aeaf16 -r d89b0a12d229 b
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/b Thu Jan 01 00:00:02 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+a
|
||||
diff -r 9161b9aeaf16 -r d89b0a12d229 g
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/g Thu Jan 01 00:00:02 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+f
|
||||
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
summary: a
|
||||
|
||||
diff -r 000000000000 -r 9161b9aeaf16 a
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/a Thu Jan 01 00:00:01 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+a
|
||||
diff -r 000000000000 -r 9161b9aeaf16 f
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/f Thu Jan 01 00:00:01 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+f
|
||||
|
||||
|
||||
log -vf dir/b
|
||||
|
||||
$ hg log -vf dir/b
|
||||
|
||||
@ -196,6 +196,14 @@ try to import --push
|
||||
now at: appendbar.diff
|
||||
$ hg qfin -a
|
||||
patch b.diff finalized without changeset message
|
||||
$ touch .hg/patches/2.diff
|
||||
$ hg qimport -r 'p1(.)::'
|
||||
abort: patch "2.diff" already exists
|
||||
[255]
|
||||
$ hg qapplied
|
||||
3.diff
|
||||
$ hg qfin -a
|
||||
$ rm .hg/patches/2.diff
|
||||
$ hg qimport -r 'p1(.)::' -P
|
||||
$ hg qpop -a
|
||||
popping 3.diff
|
||||
|
||||
@ -31,7 +31,7 @@ help qrefresh (no record)
|
||||
|
||||
options:
|
||||
|
||||
-e --edit edit commit message
|
||||
-e --edit invoke editor on commit messages
|
||||
-g --git use git extended diff format
|
||||
-s --short refresh only files already in the patch and
|
||||
specified files
|
||||
@ -75,7 +75,7 @@ help qrefresh (record)
|
||||
|
||||
options:
|
||||
|
||||
-e --edit edit commit message
|
||||
-e --edit invoke editor on commit messages
|
||||
-g --git use git extended diff format
|
||||
-s --short refresh only files already in the patch and
|
||||
specified files
|
||||
|
||||
@ -62,7 +62,7 @@ help record (record)
|
||||
list
|
||||
--amend amend the parent of the working dir
|
||||
-s --secret use the secret phase for committing
|
||||
-e --edit further edit commit message already specified
|
||||
-e --edit invoke editor on commit messages
|
||||
-I --include PATTERN [+] include names matching the given patterns
|
||||
-X --exclude PATTERN [+] exclude names matching the given patterns
|
||||
-m --message TEXT use text as commit message
|
||||
@ -135,7 +135,7 @@ help (mq present)
|
||||
|
||||
options:
|
||||
|
||||
-e --edit edit commit message
|
||||
-e --edit invoke editor on commit messages
|
||||
-g --git use git extended diff format
|
||||
-U --currentuser add "From: <current user>" to patch
|
||||
-u --user USER add "From: <USER>" to patch
|
||||
|
||||
@ -280,6 +280,12 @@ hg status -A --change 1 and revset:
|
||||
R removed
|
||||
C deleted
|
||||
|
||||
status against non-parent with unknown file (issue4321)
|
||||
|
||||
$ touch unknown
|
||||
$ hg status --rev 0 unknown
|
||||
? unknown
|
||||
|
||||
status of removed but existing in working directory. "? removed" should
|
||||
not be included:
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user