|
@@
-72,17
+72,18
b' def addremove(ui, repo, *pats, **opts):'
|
|
72
|
72
|
return cmdutil.addremove(repo, pats, opts, similarity=sim/100.)
|
|
73
|
73
|
|
|
74
|
74
|
def annotate(ui, repo, *pats, **opts):
|
|
75
|
|
"""show changeset information per file line
|
|
|
75
|
"""show changeset information by line for each file
|
|
76
|
76
|
|
|
77
|
77
|
List changes in files, showing the revision id responsible for
|
|
78
|
78
|
each line
|
|
79
|
79
|
|
|
80
|
|
This command is useful to discover who did a change or when a
|
|
81
|
|
change took place.
|
|
|
80
|
This command is useful for discovering when a change was made and
|
|
|
81
|
by whom.
|
|
82
|
82
|
|
|
83
|
83
|
Without the -a/--text option, annotate will avoid processing files
|
|
84
|
|
it detects as binary. With -a, annotate will generate an
|
|
85
|
|
annotation anyway, probably with undesirable results.
|
|
|
84
|
it detects as binary. With -a, annotate will annotate the file
|
|
|
85
|
anyway, although the results will probably be neither useful
|
|
|
86
|
nor desirable.
|
|
86
|
87
|
"""
|
|
87
|
88
|
datefunc = ui.quiet and util.shortdate or util.datestr
|
|
88
|
89
|
getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
|
|
@@
-134,7
+135,7
b' def annotate(ui, repo, *pats, **opts):'
|
|
134
|
135
|
ui.write("%s: %s" % (" ".join(p), l[1]))
|
|
135
|
136
|
|
|
136
|
137
|
def archive(ui, repo, dest, **opts):
|
|
137
|
|
'''create unversioned archive of a repository revision
|
|
|
138
|
'''create an unversioned archive of a repository revision
|
|
138
|
139
|
|
|
139
|
140
|
By default, the revision used is the parent of the working
|
|
140
|
141
|
directory; use -r/--rev to specify a different revision.
|
|
@@
-185,7
+186,7
b' def backout(ui, repo, node=None, rev=Non'
|
|
185
|
186
|
|
|
186
|
187
|
If you back out a changeset other than the tip, a new head is
|
|
187
|
188
|
created. This head will be the new tip and you should merge this
|
|
188
|
|
backout changeset with another head (current one by default).
|
|
|
189
|
backout changeset with another head.
|
|
189
|
190
|
|
|
190
|
191
|
The --merge option remembers the parent of the working directory
|
|
191
|
192
|
before starting the backout, then merges the new head with that
|
|
@@
-272,18
+273,18
b' def bisect(ui, repo, rev=None, extra=Non'
|
|
272
|
273
|
bad, then mark the latest changeset which is free from the problem
|
|
273
|
274
|
as good. Bisect will update your working directory to a revision
|
|
274
|
275
|
for testing (unless the -U/--noupdate option is specified). Once
|
|
275
|
|
you have performed tests, mark the working directory as bad or
|
|
276
|
|
good and bisect will either update to another candidate changeset
|
|
|
276
|
you have performed tests, mark the working directory as good or
|
|
|
277
|
bad, and bisect will either update to another candidate changeset
|
|
277
|
278
|
or announce that it has found the bad revision.
|
|
278
|
279
|
|
|
279
|
280
|
As a shortcut, you can also use the revision argument to mark a
|
|
280
|
281
|
revision as good or bad without checking it out first.
|
|
281
|
282
|
|
|
282
|
|
If you supply a command it will be used for automatic bisection.
|
|
283
|
|
Its exit status will be used as flag to mark revision as bad or
|
|
284
|
|
good. In case exit status is 0 the revision is marked as good, 125
|
|
285
|
|
- skipped, 127 (command not found) - bisection will be aborted;
|
|
286
|
|
any other status bigger than 0 will mark revision as bad.
|
|
|
283
|
If you supply a command, it will be used for automatic bisection.
|
|
|
284
|
Its exit status will be used to mark revisions as good or bad:
|
|
|
285
|
status 0 means good, 125 means to skip the revision, 127
|
|
|
286
|
(command not found) will abort the bisection, and any other
|
|
|
287
|
non-zero exit status means the revision is bad.
|
|
287
|
288
|
"""
|
|
288
|
289
|
def print_result(nodes, good):
|
|
289
|
290
|
displayer = cmdutil.show_changeset(ui, repo, {})
|
|
@@
-404,12
+405,13
b' def branch(ui, repo, label=None, **opts)'
|
|
404
|
405
|
"""set or show the current branch name
|
|
405
|
406
|
|
|
406
|
407
|
With no argument, show the current branch name. With one argument,
|
|
407
|
|
set the working directory branch name (the branch does not exist
|
|
408
|
|
in the repository until the next commit). It is recommended to use
|
|
409
|
|
the 'default' branch as your primary development branch.
|
|
|
408
|
set the working directory branch name (the branch will not exist
|
|
|
409
|
in the repository until the next commit). Standard practice
|
|
|
410
|
recommends that primary development take place on the 'default'
|
|
|
411
|
branch.
|
|
410
|
412
|
|
|
411
|
413
|
Unless -f/--force is specified, branch will not let you set a
|
|
412
|
|
branch name that shadows an existing branch.
|
|
|
414
|
branch name that already exists, even if it's inactive.
|
|
413
|
415
|
|
|
414
|
416
|
Use -C/--clean to reset the working directory branch to that of
|
|
415
|
417
|
the parent of the working directory, negating a previous branch
|
|
@@
-590,8
+592,7
b' def clone(ui, source, dest=None, **opts)'
|
|
590
|
592
|
|
|
591
|
593
|
It is possible to specify an ssh:// URL as the destination, but no
|
|
592
|
594
|
.hg/hgrc and working directory will be created on the remote side.
|
|
593
|
|
Look at the help text for URLs for important details about ssh://
|
|
594
|
|
URLs.
|
|
|
595
|
Please see 'hg help urls' for important details about ssh:// URLs.
|
|
595
|
596
|
|
|
596
|
597
|
For efficiency, hardlinks are used for cloning whenever the source
|
|
597
|
598
|
and destination are on the same filesystem (note this applies only
|
|
@@
-624,7
+625,7
b' def commit(ui, repo, *pats, **opts):'
|
|
624
|
625
|
|
|
625
|
626
|
Commit changes to the given files into the repository. Unlike a
|
|
626
|
627
|
centralized RCS, this operation is a local operation. See hg push
|
|
627
|
|
for means to actively distribute your changes.
|
|
|
628
|
for a way to actively distribute your changes.
|
|
628
|
629
|
|
|
629
|
630
|
If a list of files is omitted, all changes reported by "hg status"
|
|
630
|
631
|
will be committed.
|
|
@@
-675,7
+676,7
b' def copy(ui, repo, *pats, **opts):'
|
|
675
|
676
|
the source must be a single file.
|
|
676
|
677
|
|
|
677
|
678
|
By default, this command copies the contents of files as they
|
|
678
|
|
stand in the working directory. If invoked with -A/--after, the
|
|
|
679
|
exist in the working directory. If invoked with -A/--after, the
|
|
679
|
680
|
operation is recorded, but no copying is performed.
|
|
680
|
681
|
|
|
681
|
682
|
This command takes effect with the next commit. To undo a copy
|
|
@@
-788,8
+789,8
b' def showconfig(ui, repo, *values, **opts'
|
|
788
|
789
|
With multiple arguments, print names and values of all config
|
|
789
|
790
|
items with matching section names.
|
|
790
|
791
|
|
|
791
|
|
With the --debug flag, the source (filename and line number) is
|
|
792
|
|
printed for each config item.
|
|
|
792
|
With --debug, the source (filename and line number) is printed
|
|
|
793
|
for each config item.
|
|
793
|
794
|
"""
|
|
794
|
795
|
|
|
795
|
796
|
untrusted = bool(opts.get('untrusted'))
|
|
@@
-886,7
+887,7
b' def debugindex(ui, file_):'
|
|
886
|
887
|
short(node), short(pp[0]), short(pp[1])))
|
|
887
|
888
|
|
|
888
|
889
|
def debugindexdot(ui, file_):
|
|
889
|
|
"""dump an index DAG as a .dot file"""
|
|
|
890
|
"""dump an index DAG as a graphviz dot file"""
|
|
890
|
891
|
r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
|
|
891
|
892
|
ui.write("digraph G {\n")
|
|
892
|
893
|
for i in r:
|
|
@@
-1107,7
+1108,7
b' def export(ui, repo, *changesets, **opts'
|
|
1107
|
1108
|
diff anyway, probably with undesirable results.
|
|
1108
|
1109
|
|
|
1109
|
1110
|
Use the -g/--git option to generate diffs in the git extended diff
|
|
1110
|
|
format. Read the diffs help topic for more information.
|
|
|
1111
|
format. See 'hg help diffs' for more information.
|
|
1111
|
1112
|
|
|
1112
|
1113
|
With the --switch-parent option, the diff will be against the
|
|
1113
|
1114
|
second parent. It can be useful to review a merge.
|
|
@@
-1301,7
+1302,7
b' def heads(ui, repo, *branchrevs, **opts)'
|
|
1301
|
1302
|
|
|
1302
|
1303
|
With no arguments, show all repository head changesets.
|
|
1303
|
1304
|
|
|
1304
|
|
If branch or revisions names are given this will show the heads of
|
|
|
1305
|
If branch names or revisions are given this will show the heads of
|
|
1305
|
1306
|
the specified branches or the branches those revisions are tagged
|
|
1306
|
1307
|
with.
|
|
1307
|
1308
|
|
|
@@
-1311,7
+1312,7
b' def heads(ui, repo, *branchrevs, **opts)'
|
|
1311
|
1312
|
|
|
1312
|
1313
|
Branch heads are changesets that have a given branch tag, but have
|
|
1313
|
1314
|
no child changesets with that tag. They are usually where
|
|
1314
|
|
development on the given branch takes place.
|
|
|
1315
|
development on a given branch takes place.
|
|
1315
|
1316
|
"""
|
|
1316
|
1317
|
if opts.get('rev'):
|
|
1317
|
1318
|
start = repo.lookup(opts['rev'])
|
|
@@
-1353,7
+1354,7
b' def heads(ui, repo, *branchrevs, **opts)'
|
|
1353
|
1354
|
def help_(ui, name=None, with_version=False):
|
|
1354
|
1355
|
"""show help for a given topic or a help overview
|
|
1355
|
1356
|
|
|
1356
|
|
With no arguments, print a list of commands and short help.
|
|
|
1357
|
With no arguments, print a list of commands with short help messages.
|
|
1357
|
1358
|
|
|
1358
|
1359
|
Given a topic, extension, or command name, print help for that
|
|
1359
|
1360
|
topic."""
|
|
@@
-1576,7
+1577,8
b' def identify(ui, repo, source=None,'
|
|
1576
|
1577
|
With no revision, print a summary of the current state of the
|
|
1577
|
1578
|
repository.
|
|
1578
|
1579
|
|
|
1579
|
|
With a path, do a lookup in another repository.
|
|
|
1580
|
Specifying a path to a repository root or Mercurial bundle will
|
|
|
1581
|
cause lookup to operate on that repository/bundle.
|
|
1580
|
1582
|
|
|
1581
|
1583
|
This summary identifies the repository state using one or two
|
|
1582
|
1584
|
parent hash identifiers, followed by a "+" if there are
|
|
@@
-1652,8
+1654,8
b' def import_(ui, repo, patch1, *patches, '
|
|
1652
|
1654
|
will abort unless given the -f/--force flag.
|
|
1653
|
1655
|
|
|
1654
|
1656
|
You can import a patch straight from a mail message. Even patches
|
|
1655
|
|
as attachments work (body part must be type text/plain or
|
|
1656
|
|
text/x-patch to be used). From and Subject headers of email
|
|
|
1657
|
as attachments work (to use the body part, it must have type
|
|
|
1658
|
text/plain or text/x-patch). From and Subject headers of email
|
|
1657
|
1659
|
message are used as default committer and commit message. All
|
|
1658
|
1660
|
text/plain body parts before first diff are added to commit
|
|
1659
|
1661
|
message.
|
|
@@
-1672,8
+1674,8
b' def import_(ui, repo, patch1, *patches, '
|
|
1672
|
1674
|
With -s/--similarity, hg will attempt to discover renames and
|
|
1673
|
1675
|
copies in the patch in the same way as 'addremove'.
|
|
1674
|
1676
|
|
|
1675
|
|
To read a patch from standard input, use patch name "-". See 'hg
|
|
1676
|
|
help dates' for a list of formats valid for -d/--date.
|
|
|
1677
|
To read a patch from standard input, use "-" as the patch name.
|
|
|
1678
|
See 'hg help dates' for a list of formats valid for -d/--date.
|
|
1677
|
1679
|
"""
|
|
1678
|
1680
|
patches = (patch1,) + patches
|
|
1679
|
1681
|
|
|
@@
-1774,8
+1776,8
b' def incoming(ui, repo, source="default",'
|
|
1774
|
1776
|
"""show new changesets found in source
|
|
1775
|
1777
|
|
|
1776
|
1778
|
Show new changesets found in the specified path/URL or the default
|
|
1777
|
|
pull location. These are the changesets that would be pulled if a
|
|
1778
|
|
pull was requested.
|
|
|
1779
|
pull location. These are the changesets that would have been pulled
|
|
|
1780
|
if a pull at the time you issued this command.
|
|
1779
|
1781
|
|
|
1780
|
1782
|
For remote repository, using --bundle avoids downloading the
|
|
1781
|
1783
|
changesets twice if the incoming is followed by a pull.
|
|
@@
-1843,7
+1845,7
b' def init(ui, dest=".", **opts):'
|
|
1843
|
1845
|
"""create a new repository in the given directory
|
|
1844
|
1846
|
|
|
1845
|
1847
|
Initialize a new repository in the given directory. If the given
|
|
1846
|
|
directory does not exist, it is created.
|
|
|
1848
|
directory does not exist, it will be created.
|
|
1847
|
1849
|
|
|
1848
|
1850
|
If no directory is given, the current directory is used.
|
|
1849
|
1851
|
|
|
@@
-1855,15
+1857,15
b' def init(ui, dest=".", **opts):'
|
|
1855
|
1857
|
def locate(ui, repo, *pats, **opts):
|
|
1856
|
1858
|
"""locate files matching specific patterns
|
|
1857
|
1859
|
|
|
1858
|
|
Print all files under Mercurial control whose names match the
|
|
1859
|
|
given patterns.
|
|
1860
|
|
|
|
1861
|
|
This command searches the entire repository by default. To search
|
|
1862
|
|
just the current directory and its subdirectories, use
|
|
1863
|
|
"--include .".
|
|
1864
|
|
|
|
1865
|
|
If no patterns are given to match, this command prints all file
|
|
1866
|
|
names.
|
|
|
1860
|
Print files under Mercurial control in the working directory whose
|
|
|
1861
|
names match the given patterns.
|
|
|
1862
|
|
|
|
1863
|
By default, this command searches all directories in the working
|
|
|
1864
|
directory. To search just the current directory and its
|
|
|
1865
|
subdirectories, use "--include .".
|
|
|
1866
|
|
|
|
1867
|
If no patterns are given to match, this command prints the names
|
|
|
1868
|
of all files under Mercurial control in the working directory.
|
|
1867
|
1869
|
|
|
1868
|
1870
|
If you want to feed the output of this command into the "xargs"
|
|
1869
|
1871
|
command, use the -0 option to both this command and "xargs". This
|
|
@@
-1905,16
+1907,15
b' def log(ui, repo, *pats, **opts):'
|
|
1905
|
1907
|
|
|
1906
|
1908
|
See 'hg help dates' for a list of formats valid for -d/--date.
|
|
1907
|
1909
|
|
|
1908
|
|
By default this command outputs: changeset id and hash, tags,
|
|
1909
|
|
non-trivial parents, user, date and time, and a summary for each
|
|
1910
|
|
commit. When the -v/--verbose switch is used, the list of changed
|
|
1911
|
|
files and full commit message is shown.
|
|
|
1910
|
By default this command prints revision number and changeset id,
|
|
|
1911
|
tags, non-trivial parents, user, date and time, and a summary for
|
|
|
1912
|
each commit. When the -v/--verbose switch is used, the list of
|
|
|
1913
|
changed files and full commit message are shown.
|
|
1912
|
1914
|
|
|
1913
|
1915
|
NOTE: log -p/--patch may generate unexpected diff output for merge
|
|
1914
|
1916
|
changesets, as it will only compare the merge changeset against
|
|
1915
|
|
its first parent. Also, the files: list will only reflect files
|
|
1916
|
|
that are different from BOTH parents.
|
|
1917
|
|
|
|
|
1917
|
its first parent. Also, only files different from BOTH parents
|
|
|
1918
|
will appear in files:.
|
|
1918
|
1919
|
"""
|
|
1919
|
1920
|
|
|
1920
|
1921
|
get = util.cachefunc(lambda r: repo[r].changeset())
|
|
@@
-2019,10
+2020,10
b' def manifest(ui, repo, node=None, rev=No'
|
|
2019
|
2020
|
|
|
2020
|
2021
|
Print a list of version controlled files for the given revision.
|
|
2021
|
2022
|
If no revision is given, the first parent of the working directory
|
|
2022
|
|
is used, or the null revision if none is checked out.
|
|
2023
|
|
|
|
2024
|
|
With -v flag, print file permissions, symlink and executable bits.
|
|
2025
|
|
With --debug flag, print file revision hashes.
|
|
|
2023
|
is used, or the null revision if no revision is checked out.
|
|
|
2024
|
|
|
|
2025
|
With -v, print file permissions, symlink and executable bits.
|
|
|
2026
|
With --debug, print file revision hashes.
|
|
2026
|
2027
|
"""
|
|
2027
|
2028
|
|
|
2028
|
2029
|
if rev and node:
|
|
@@
-2043,18
+2044,18
b' def manifest(ui, repo, node=None, rev=No'
|
|
2043
|
2044
|
def merge(ui, repo, node=None, **opts):
|
|
2044
|
2045
|
"""merge working directory with another revision
|
|
2045
|
2046
|
|
|
2046
|
|
The contents of the current working directory is updated with all
|
|
2047
|
|
changes made in the requested revision since the last common
|
|
2048
|
|
predecessor revision.
|
|
|
2047
|
The current working directory is updated with all changes made in
|
|
|
2048
|
the requested revision since the last common predecessor revision.
|
|
2049
|
2049
|
|
|
2050
|
2050
|
Files that changed between either parent are marked as changed for
|
|
2051
|
2051
|
the next commit and a commit must be performed before any further
|
|
2052
|
|
updates are allowed. The next commit has two parents.
|
|
|
2052
|
updates to the repository are allowed. The next commit will have
|
|
|
2053
|
two parents.
|
|
2053
|
2054
|
|
|
2054
|
2055
|
If no revision is specified, the working directory's parent is a
|
|
2055
|
2056
|
head revision, and the current branch contains exactly one other
|
|
2056
|
2057
|
head, the other head is merged with by default. Otherwise, an
|
|
2057
|
|
explicit revision to merge with must be provided.
|
|
|
2058
|
explicit revision with which to merge with must be provided.
|
|
2058
|
2059
|
"""
|
|
2059
|
2060
|
|
|
2060
|
2061
|
if opts.get('rev') and node:
|
|
@@
-2138,9
+2139,9
b' def parents(ui, repo, file_=None, **opts'
|
|
2138
|
2139
|
|
|
2139
|
2140
|
Print the working directory's parent revisions. If a revision is
|
|
2140
|
2141
|
given via -r/--rev, the parent of that revision will be printed.
|
|
2141
|
|
If a file argument is given, revision in which the file was last
|
|
2142
|
|
changed (before the working directory revision or the argument to
|
|
2143
|
|
--rev if given) is printed.
|
|
|
2142
|
If a file argument is given, the revision in which the file was
|
|
|
2143
|
last changed (before the working directory revision or the
|
|
|
2144
|
argument to --rev if given) is printed.
|
|
2144
|
2145
|
"""
|
|
2145
|
2146
|
rev = opts.get('rev')
|
|
2146
|
2147
|
if rev:
|
|
@@
-2177,7
+2178,7
b' def paths(ui, repo, search=None):'
|
|
2177
|
2178
|
"""show aliases for remote repositories
|
|
2178
|
2179
|
|
|
2179
|
2180
|
Show definition of symbolic path name NAME. If no name is given,
|
|
2180
|
|
show definition of available names.
|
|
|
2181
|
show definition of all available names.
|
|
2181
|
2182
|
|
|
2182
|
2183
|
Path names are defined in the [paths] section of /etc/mercurial/hgrc
|
|
2183
|
2184
|
and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
|
|
@@
-2211,14
+2212,17
b' def postincoming(ui, repo, modheads, opt'
|
|
2211
|
2212
|
def pull(ui, repo, source="default", **opts):
|
|
2212
|
2213
|
"""pull changes from the specified source
|
|
2213
|
2214
|
|
|
2214
|
|
Pull changes from a remote repository to the local one.
|
|
|
2215
|
Pull changes from a remote repository to a local one.
|
|
2215
|
2216
|
|
|
2216
|
2217
|
This finds all changes from the repository at the specified path
|
|
2217
|
|
or URL and adds them to the local repository. By default, this
|
|
2218
|
|
does not update the copy of the project in the working directory.
|
|
2219
|
|
|
|
2220
|
|
Use hg incoming if you want to see what will be added by the next
|
|
2221
|
|
pull without actually adding the changes to the repository.
|
|
|
2218
|
or URL and adds them to a local repository (the current one unless
|
|
|
2219
|
-R is specified). By default, this does not update the copy of the
|
|
|
2220
|
project in the working directory.
|
|
|
2221
|
|
|
|
2222
|
Use hg incoming if you want to see what would have been added by a
|
|
|
2223
|
pull at the time you issued this command. If you then decide to
|
|
|
2224
|
added those changes to the repository, you should use pull -r X
|
|
|
2225
|
where X is the last changeset listed by hg incoming.
|
|
2222
|
2226
|
|
|
2223
|
2227
|
If SOURCE is omitted, the 'default' path will be used.
|
|
2224
|
2228
|
See 'hg help urls' for more information.
|
|
@@
-2249,12
+2253,12
b' def push(ui, repo, dest=None, **opts):'
|
|
2249
|
2253
|
|
|
2250
|
2254
|
By default, push will refuse to run if it detects the result would
|
|
2251
|
2255
|
increase the number of remote heads. This generally indicates the
|
|
2252
|
|
the client has forgotten to pull and merge before pushing.
|
|
|
2256
|
user forgot to pull and merge before pushing.
|
|
2253
|
2257
|
|
|
2254
|
2258
|
If -r/--rev is used, the named revision and all its ancestors will
|
|
2255
|
2259
|
be pushed to the remote repository.
|
|
2256
|
2260
|
|
|
2257
|
|
Look at the help text for URLs for important details about ssh://
|
|
|
2261
|
Please see 'hg help urls' for important details about ssh://
|
|
2258
|
2262
|
URLs. If DESTINATION is omitted, a default path will be used.
|
|
2259
|
2263
|
See 'hg help urls' for more information.
|
|
2260
|
2264
|
"""
|
|
@@
-2289,13
+2293,13
b' def remove(ui, repo, *pats, **opts):'
|
|
2289
|
2293
|
entire project history. -A/--after can be used to remove only
|
|
2290
|
2294
|
files that have already been deleted, -f/--force can be used to
|
|
2291
|
2295
|
force deletion, and -Af can be used to remove files from the next
|
|
2292
|
|
revision without deleting them.
|
|
|
2296
|
revision without deleting them from the working directory.
|
|
2293
|
2297
|
|
|
2294
|
2298
|
The following table details the behavior of remove for different
|
|
2295
|
2299
|
file states (columns) and option combinations (rows). The file
|
|
2296
|
|
states are Added, Clean, Modified and Missing (as reported by hg
|
|
2297
|
|
status). The actions are Warn, Remove (from branch) and Delete
|
|
2298
|
|
(from disk).
|
|
|
2300
|
states are Added [A], Clean [C], Modified [M] and Missing [!]
|
|
|
2301
|
(as reported by hg status). The actions are Warn, Remove (from
|
|
|
2302
|
branch) and Delete (from disk).
|
|
2299
|
2303
|
|
|
2300
|
2304
|
A C M !
|
|
2301
|
2305
|
none W RD W R
|
|
@@
-2372,9
+2376,9
b' def resolve(ui, repo, *pats, **opts):'
|
|
2372
|
2376
|
will be overwritten if the merge is retried with resolve. The
|
|
2373
|
2377
|
-m/--mark switch should be used to mark the file as resolved.
|
|
2374
|
2378
|
|
|
2375
|
|
This command will also allow listing resolved files and manually
|
|
2376
|
|
marking and unmarking files as resolved. All files must be marked
|
|
2377
|
|
as resolved before the new commits are permitted.
|
|
|
2379
|
This command also allows listing resolved files and manually
|
|
|
2380
|
indicating whether or not files are resolved. All files must be
|
|
|
2381
|
marked as resolved before a commit is permitted.
|
|
2378
|
2382
|
|
|
2379
|
2383
|
The codes used to show the status of files are:
|
|
2380
|
2384
|
U = unresolved
|
|
@@
-2737,10
+2741,10
b' def status(ui, repo, *pats, **opts):'
|
|
2737
|
2741
|
|
|
2738
|
2742
|
Show status of files in the repository. If names are given, only
|
|
2739
|
2743
|
files that match are shown. Files that are clean or ignored or
|
|
2740
|
|
source of a copy/move operation, are not listed unless -c/--clean,
|
|
2741
|
|
-i/--ignored, -C/--copies or -A/--all is given. Unless options
|
|
2742
|
|
described with "show only ..." are given, the options -mardu are
|
|
2743
|
|
used.
|
|
|
2744
|
the source of a copy/move operation, are not listed unless
|
|
|
2745
|
-c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
|
|
|
2746
|
Unless options described with "show only ..." are given, the
|
|
|
2747
|
options -mardu are used.
|
|
2744
|
2748
|
|
|
2745
|
2749
|
Option -q/--quiet hides untracked (unknown and ignored) files
|
|
2746
|
2750
|
unless explicitly requested with -u/--unknown or -i/--ignored.
|
|
@@
-2751,7
+2755,8
b' def status(ui, repo, *pats, **opts):'
|
|
2751
|
2755
|
to one merge parent.
|
|
2752
|
2756
|
|
|
2753
|
2757
|
If one revision is given, it is used as the base revision.
|
|
2754
|
|
If two revisions are given, the difference between them is shown.
|
|
|
2758
|
If two revisions are given, the differences between them are
|
|
|
2759
|
shown.
|
|
2755
|
2760
|
|
|
2756
|
2761
|
The codes used to show the status of files are:
|
|
2757
|
2762
|
M = modified
|
|
@@
-2761,7
+2766,7
b' def status(ui, repo, *pats, **opts):'
|
|
2761
|
2766
|
! = missing (deleted by non-hg command, but still tracked)
|
|
2762
|
2767
|
? = not tracked
|
|
2763
|
2768
|
I = ignored
|
|
2764
|
|
= the previous added file was copied from here
|
|
|
2769
|
= origin of the previous file listed as A (added)
|
|
2765
|
2770
|
"""
|
|
2766
|
2771
|
|
|
2767
|
2772
|
node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
|
|
@@
-2902,9
+2907,9
b' def tags(ui, repo):'
|
|
2902
|
2907
|
def tip(ui, repo, **opts):
|
|
2903
|
2908
|
"""show the tip revision
|
|
2904
|
2909
|
|
|
2905
|
|
The tip revision (usually just called the tip) is the most
|
|
2906
|
|
recently added changeset in the repository, the most recently
|
|
2907
|
|
changed head.
|
|
|
2910
|
The tip revision (usually just called the tip) is the changeset
|
|
|
2911
|
most recently added to the repository (and therefore the most
|
|
|
2912
|
recently changed head).
|
|
2908
|
2913
|
|
|
2909
|
2914
|
If you have just made a commit, that commit will be the tip. If
|
|
2910
|
2915
|
you have just pulled changes from another repository, the tip of
|