Mercurial > hg
annotate contrib/tcsh_completion @ 13155:f02d7a562a21
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)
This patch avoids empty commit when .hgsubstate is dirty. Empty commit
was caused by .hgsubstate being updated back to the state of the
working copy parent when committing, if a user had changed it manually
and not made any changes in subrepositories.
The subrepository state from the working copies parent is compared
with the state calculated as a result of trying to commit the
subrepositories. If the two states are the same, then return None
otherwise the commit is just done.
The line: "committing subrepository x" will be written if there is
nothing committed, but .hgsubstate is dirty for x subrepository.
author | Erik Zielke <ez@aragost.com> |
---|---|
date | Mon, 29 Nov 2010 09:37:23 +0100 |
parents | 4061205ad9e1 |
children | 2616325766e3 |
rev | line source |
---|---|
1156 | 1 # |
2 # tcsh completion for Mercurial | |
3 # | |
4 # This file has been auto-generated by tcsh_completion_build.sh for | |
11445
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
5 # Mercurial Distributed SCM (version 1.5.4+154-8b452fe4bf50) |
1156 | 6 # |
7 # Copyright (C) 2005 TK Soh. | |
8 # | |
9 # This is free software; you can redistribute it and/or modify it under | |
10 # the terms of the GNU General Public License as published by the Free | |
11 # Software Foundation; either version 2 of the License, or (at your | |
1308
2073e5a71008
Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1264
diff
changeset
|
12 # option) any later version. |
1156 | 13 # |
14 | |
15 complete hg \ | |
16 'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \ | |
1158
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
17 'C/-/( -R --repository \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
18 --cwd \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
19 -y --noninteractive \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
20 -q --quiet \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
21 -v --verbose \ |
7766
2b2548342265
Update tcsh completion scripts with new commands and for new help output.
Gilles Moris <gilles.moris@free.fr>
parents:
1308
diff
changeset
|
22 --config \ |
1158
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
23 --debug \ |
1264
be4a14bfaa9c
Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1158
diff
changeset
|
24 --debugger \ |
7766
2b2548342265
Update tcsh completion scripts with new commands and for new help output.
Gilles Moris <gilles.moris@free.fr>
parents:
1308
diff
changeset
|
25 --encoding \ |
2b2548342265
Update tcsh completion scripts with new commands and for new help output.
Gilles Moris <gilles.moris@free.fr>
parents:
1308
diff
changeset
|
26 --encodingmode \ |
1158
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
27 --traceback \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
28 --time \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
29 --profile \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
30 --version \ |
4650ec7ef690
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents:
1156
diff
changeset
|
31 -h --help)/' \ |
7766
2b2548342265
Update tcsh completion scripts with new commands and for new help output.
Gilles Moris <gilles.moris@free.fr>
parents:
1308
diff
changeset
|
32 'p/1/(add addremove annotate blame archive \ |
2b2548342265
Update tcsh completion scripts with new commands and for new help output.
Gilles Moris <gilles.moris@free.fr>
parents:
1308
diff
changeset
|
33 backout bisect branch branches bundle \ |
2b2548342265
Update tcsh completion scripts with new commands and for new help output.
Gilles Moris <gilles.moris@free.fr>
parents:
1308
diff
changeset
|
34 cat clone commit ci copy \ |
11445
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
35 cp debugancestor debugbuilddag debugcheckstate debugcommands \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
36 debugcomplete debugdag debugdata debugdate debugfsinfo \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
37 debugindex debugindexdot debuginstall debugpushkey debugrebuildstate \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
38 debugrename debugrevspec debugsetparents debugstate debugsub \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
39 debugwalk diff export forget grep \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
40 heads help identify id import \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
41 patch incoming in init locate \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
42 log history manifest merge outgoing \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
43 out parents paths pull push \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
44 recover remove rm rename mv \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
45 resolve revert rollback root serve \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
46 showconfig debugconfig status st summary \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
47 sum tag tags tip unbundle \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
48 update up checkout co verify \ |
4061205ad9e1
contrib: update tcsh_completion with commands for 1.6
Gilles Moris <gilles.moris@free.fr>
parents:
9638
diff
changeset
|
49 version)/' |
1156 | 50 |