mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
Merge with crew
This commit is contained in:
commit
f93eb1deca
@ -457,7 +457,7 @@ def diffbookmarks(ui, repo, remote):
|
|||||||
lmarks = repo.listkeys('bookmarks')
|
lmarks = repo.listkeys('bookmarks')
|
||||||
rmarks = remote.listkeys('bookmarks')
|
rmarks = remote.listkeys('bookmarks')
|
||||||
|
|
||||||
diff = set(rmarks) - set(lmarks)
|
diff = sorted(set(rmarks) - set(lmarks))
|
||||||
for k in diff:
|
for k in diff:
|
||||||
ui.write(" %-25s %s\n" % (k, rmarks[k][:12]))
|
ui.write(" %-25s %s\n" % (k, rmarks[k][:12]))
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ def convert(ui, src, dest=None, revmapfile=None, **opts):
|
|||||||
|
|
||||||
rename path/to/source path/to/destination
|
rename path/to/source path/to/destination
|
||||||
|
|
||||||
Comment lines start with '#'. A specificed path matches if it
|
Comment lines start with '#'. A specified path matches if it
|
||||||
equals the full relative name of a file or one of its parent
|
equals the full relative name of a file or one of its parent
|
||||||
directories. The 'include' or 'exclude' directive with the longest
|
directories. The 'include' or 'exclude' directive with the longest
|
||||||
matching path applies, so line order does not matter.
|
matching path applies, so line order does not matter.
|
||||||
@ -96,8 +96,8 @@ def convert(ui, src, dest=None, revmapfile=None, **opts):
|
|||||||
exclusion of all other files and directories not explicitly
|
exclusion of all other files and directories not explicitly
|
||||||
included. The 'exclude' directive causes files or directories to
|
included. The 'exclude' directive causes files or directories to
|
||||||
be omitted. The 'rename' directive renames a file or directory if
|
be omitted. The 'rename' directive renames a file or directory if
|
||||||
is converted. To rename from a subdirectory into the root of the
|
it is converted. To rename from a subdirectory into the root of
|
||||||
repository, use '.' as the path to rename to.
|
the repository, use '.' as the path to rename to.
|
||||||
|
|
||||||
The splicemap is a file that allows insertion of synthetic
|
The splicemap is a file that allows insertion of synthetic
|
||||||
history, letting you specify the parents of a revision. This is
|
history, letting you specify the parents of a revision. This is
|
||||||
|
@ -890,7 +890,7 @@ def debugbuilddag(ui, repo, text,
|
|||||||
# we don't want to fail in merges during buildup
|
# we don't want to fail in merges during buildup
|
||||||
os.environ['HGMERGE'] = 'internal:local'
|
os.environ['HGMERGE'] = 'internal:local'
|
||||||
|
|
||||||
def writefile(fname, text, fmode="w"):
|
def writefile(fname, text, fmode="wb"):
|
||||||
f = open(fname, fmode)
|
f = open(fname, fmode)
|
||||||
try:
|
try:
|
||||||
f.write(text)
|
f.write(text)
|
||||||
@ -925,7 +925,7 @@ def debugbuilddag(ui, repo, text,
|
|||||||
merge(ui, repo, node=p2)
|
merge(ui, repo, node=p2)
|
||||||
|
|
||||||
if mergeable_file:
|
if mergeable_file:
|
||||||
f = open("mf", "r+")
|
f = open("mf", "rb+")
|
||||||
try:
|
try:
|
||||||
lines = f.read().split("\n")
|
lines = f.read().split("\n")
|
||||||
lines[id * linesperrev] += " r%i" % id
|
lines[id * linesperrev] += " r%i" % id
|
||||||
@ -935,7 +935,7 @@ def debugbuilddag(ui, repo, text,
|
|||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
if appended_file:
|
if appended_file:
|
||||||
writefile("af", "r%i\n" % id, "a")
|
writefile("af", "r%i\n" % id, "ab")
|
||||||
|
|
||||||
if overwritten_file:
|
if overwritten_file:
|
||||||
writefile("of", "r%i\n" % id)
|
writefile("of", "r%i\n" % id)
|
||||||
|
@ -24,7 +24,7 @@ def dispatch(args):
|
|||||||
except util.Abort, inst:
|
except util.Abort, inst:
|
||||||
sys.stderr.write(_("abort: %s\n") % inst)
|
sys.stderr.write(_("abort: %s\n") % inst)
|
||||||
if inst.hint:
|
if inst.hint:
|
||||||
sys.stdout.write(_("(%s)\n") % inst.hint)
|
sys.stderr.write(_("(%s)\n") % inst.hint)
|
||||||
return -1
|
return -1
|
||||||
except error.ParseError, inst:
|
except error.ParseError, inst:
|
||||||
if len(inst.args) > 1:
|
if len(inst.args) > 1:
|
||||||
@ -119,7 +119,7 @@ def _runcatch(ui, args):
|
|||||||
except util.Abort, inst:
|
except util.Abort, inst:
|
||||||
ui.warn(_("abort: %s\n") % inst)
|
ui.warn(_("abort: %s\n") % inst)
|
||||||
if inst.hint:
|
if inst.hint:
|
||||||
ui.status(_("(%s)\n") % inst.hint)
|
ui.warn(_("(%s)\n") % inst.hint)
|
||||||
except ImportError, inst:
|
except ImportError, inst:
|
||||||
ui.warn(_("abort: %s!\n") % inst)
|
ui.warn(_("abort: %s!\n") % inst)
|
||||||
m = str(inst).split()[-1]
|
m = str(inst).split()[-1]
|
||||||
|
@ -16,7 +16,7 @@ Branch
|
|||||||
a remote repository, since new heads may be created by these
|
a remote repository, since new heads may be created by these
|
||||||
operations. Note that the term branch can also be used informally
|
operations. Note that the term branch can also be used informally
|
||||||
to describe a development process in which certain development is
|
to describe a development process in which certain development is
|
||||||
done independently of other development.This is sometimes done
|
done independently of other development. This is sometimes done
|
||||||
explicitly with a named branch, but it can also be done locally,
|
explicitly with a named branch, but it can also be done locally,
|
||||||
using bookmarks or clones and anonymous branches.
|
using bookmarks or clones and anonymous branches.
|
||||||
|
|
||||||
|
@ -58,8 +58,7 @@ The following predicates are supported:
|
|||||||
Alias for ``user(string)``.
|
Alias for ``user(string)``.
|
||||||
|
|
||||||
``branch(set)``
|
``branch(set)``
|
||||||
The branch names are found for changesets in set, and the result is
|
All changesets belonging to the branches of changesets in set.
|
||||||
all changesets belonging to one those branches.
|
|
||||||
|
|
||||||
``children(set)``
|
``children(set)``
|
||||||
Child changesets of changesets in set.
|
Child changesets of changesets in set.
|
||||||
@ -74,10 +73,10 @@ The following predicates are supported:
|
|||||||
Changesets within the interval, see :hg:`help dates`.
|
Changesets within the interval, see :hg:`help dates`.
|
||||||
|
|
||||||
``descendants(set)``
|
``descendants(set)``
|
||||||
Changesets which are decendants of changesets in set.
|
Changesets which are descendants of changesets in set.
|
||||||
|
|
||||||
``file(pattern)``
|
``file(pattern)``
|
||||||
Changesets which manually affected files matching pattern.
|
Changesets affecting files matched by pattern.
|
||||||
|
|
||||||
``follow()``
|
``follow()``
|
||||||
An alias for ``::.`` (ancestors of the working copy's first parent).
|
An alias for ``::.`` (ancestors of the working copy's first parent).
|
||||||
@ -105,10 +104,11 @@ The following predicates are supported:
|
|||||||
Changeset is a merge changeset.
|
Changeset is a merge changeset.
|
||||||
|
|
||||||
``modifies(pattern)``
|
``modifies(pattern)``
|
||||||
Changesets which modify files matching pattern.
|
Changesets modifying files matched by pattern.
|
||||||
|
|
||||||
``outgoing([path])``
|
``outgoing([path])``
|
||||||
Changesets missing in path.
|
Changesets not found in the specified destination repository, or the
|
||||||
|
default push location.
|
||||||
|
|
||||||
``p1(set)``
|
``p1(set)``
|
||||||
First parent of changesets in set.
|
First parent of changesets in set.
|
||||||
|
@ -115,7 +115,7 @@ class transaction(object):
|
|||||||
def release(self):
|
def release(self):
|
||||||
if self.count > 0:
|
if self.count > 0:
|
||||||
self.usages -= 1
|
self.usages -= 1
|
||||||
# of the transaction scopes are left without being closed, fail
|
# if the transaction scopes are left without being closed, fail
|
||||||
if self.count > 0 and self.usages == 0:
|
if self.count > 0 and self.usages == 0:
|
||||||
self._abort()
|
self._abort()
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ convert a foreign SCM repository to a Mercurial one.
|
|||||||
|
|
||||||
rename path/to/source path/to/destination
|
rename path/to/source path/to/destination
|
||||||
|
|
||||||
Comment lines start with '#'. A specificed path matches if it equals the
|
Comment lines start with '#'. A specified path matches if it equals the
|
||||||
full relative name of a file or one of its parent directories. The
|
full relative name of a file or one of its parent directories. The
|
||||||
'include' or 'exclude' directive with the longest matching path applies,
|
'include' or 'exclude' directive with the longest matching path applies,
|
||||||
so line order does not matter.
|
so line order does not matter.
|
||||||
@ -74,7 +74,7 @@ convert a foreign SCM repository to a Mercurial one.
|
|||||||
be included in the destination repository, and the exclusion of all other
|
be included in the destination repository, and the exclusion of all other
|
||||||
files and directories not explicitly included. The 'exclude' directive
|
files and directories not explicitly included. The 'exclude' directive
|
||||||
causes files or directories to be omitted. The 'rename' directive renames
|
causes files or directories to be omitted. The 'rename' directive renames
|
||||||
a file or directory if is converted. To rename from a subdirectory into
|
a file or directory if it is converted. To rename from a subdirectory into
|
||||||
the root of the repository, use '.' as the path to rename to.
|
the root of the repository, use '.' as the path to rename to.
|
||||||
|
|
||||||
The splicemap is a file that allows insertion of synthetic history,
|
The splicemap is a file that allows insertion of synthetic history,
|
||||||
|
@ -13,6 +13,8 @@ cd repo
|
|||||||
hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -oa
|
hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -oa
|
||||||
echo -- dag
|
echo -- dag
|
||||||
hg debugdag -t -b
|
hg debugdag -t -b
|
||||||
|
echo -- tip
|
||||||
|
hg id
|
||||||
echo -- glog
|
echo -- glog
|
||||||
hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
|
hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
|
||||||
echo -- glog of
|
echo -- glog of
|
||||||
@ -35,6 +37,8 @@ cd repo
|
|||||||
hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn
|
hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn
|
||||||
echo -- dag
|
echo -- dag
|
||||||
hg debugdag -t -b
|
hg debugdag -t -b
|
||||||
|
echo -- tip
|
||||||
|
hg id
|
||||||
echo -- glog
|
echo -- glog
|
||||||
hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
|
hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
|
||||||
echo -- glog mf
|
echo -- glog mf
|
||||||
|
@ -4,6 +4,8 @@
|
|||||||
+3:p2
|
+3:p2
|
||||||
@temp*f+3
|
@temp*f+3
|
||||||
@default*/p2+2:tip
|
@default*/p2+2:tip
|
||||||
|
-- tip
|
||||||
|
f96e381c614c tip
|
||||||
-- glog
|
-- glog
|
||||||
@ 11: r11 [] @ 11.00
|
@ 11: r11 [] @ 11.00
|
||||||
|
|
|
|
||||||
@ -101,6 +103,8 @@ r11
|
|||||||
+3:p2
|
+3:p2
|
||||||
@temp*f+3
|
@temp*f+3
|
||||||
@default*/p2+2:tip
|
@default*/p2+2:tip
|
||||||
|
-- tip
|
||||||
|
9c5ce9b70771 tip
|
||||||
-- glog
|
-- glog
|
||||||
@ 11: r11 [] @ 11.00
|
@ 11: r11 [] @ 11.00
|
||||||
|
|
|
|
||||||
|
@ -183,13 +183,13 @@ added 1 changesets with 1 changes to 1 files
|
|||||||
% push -f
|
% push -f
|
||||||
committing subrepository s
|
committing subrepository s
|
||||||
abort: push creates new remote heads on branch 'default'!
|
abort: push creates new remote heads on branch 'default'!
|
||||||
|
(did you forget to merge? use push -f to force)
|
||||||
pushing ...sub/t
|
pushing ...sub/t
|
||||||
pushing ...sub/t/s/ss
|
pushing ...sub/t/s/ss
|
||||||
searching for changes
|
searching for changes
|
||||||
no changes found
|
no changes found
|
||||||
pushing ...sub/t/s
|
pushing ...sub/t/s
|
||||||
searching for changes
|
searching for changes
|
||||||
(did you forget to merge? use push -f to force)
|
|
||||||
pushing ...sub/t
|
pushing ...sub/t
|
||||||
pushing ...sub/t/s/ss
|
pushing ...sub/t/s/ss
|
||||||
searching for changes
|
searching for changes
|
||||||
@ -300,4 +300,5 @@ added 1 changesets with 1 changes to 1 files
|
|||||||
created new head
|
created new head
|
||||||
committing subrepository s
|
committing subrepository s
|
||||||
abort: push creates new remote heads on branch 'default'!
|
abort: push creates new remote heads on branch 'default'!
|
||||||
|
(did you forget to merge? use push -f to force)
|
||||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||||
|
Loading…
Reference in New Issue
Block a user