Brendan Cully
81f4208ee0
Remove debugging line
2006-08-11 16:55:48 -07:00
Brendan Cully
140c2e7776
Fix bad merge with crew
2006-08-11 16:30:24 -07:00
Brendan Cully
4f1b3a83bb
Move patch-related code into its own module.
2006-08-11 15:50:16 -07:00
Brendan Cully
7601c19932
Teach import to understand git diff extensions.
...
Vanilla patch chokes on git patches that include files that are copied
or renamed, then modified. So this code detects that case and rewrites
the patch if necessary.
2006-08-11 15:50:07 -07:00
Vadim Gelfer
f878066622
import: get lock and wlock one time
...
this makes import of many patches 6x faster in kernel repo.
2006-08-11 14:50:41 -07:00
Vadim Gelfer
5a39b6dc91
call reposetup functions of extension modules whenever repo created
2006-08-10 15:44:05 -07:00
Matt Mackall
76c5adea2f
Merge with crew, fix most tests
2006-08-09 13:55:18 -05:00
Vadim Gelfer
b365694c04
fetch: hold lock and wlock across all operations
2006-08-08 17:08:59 -07:00
Vadim Gelfer
9b3aa8dfc1
fetch: fix breakage from mpm.
...
add test so will not break again.
2006-08-08 16:09:26 -07:00
Matt Mackall
55b6f733d9
Merge: combine force and forcemerge arguments
2006-08-08 10:56:48 -05:00
Matt Mackall
94db72708b
Merge: move most tests to the beginning
2006-08-08 10:35:19 -05:00
Matt Mackall
f8ef0497f7
Merge: refactor err and failedmerge -> unresolved
2006-08-08 09:26:00 -05:00
Matt Mackall
0b0ee1ba50
Refactor update locking slightly
2006-08-08 09:19:20 -05:00
Matt Mackall
60a6e68764
Merge: combine choose and moddirstate to partial
2006-08-08 09:11:16 -05:00
Matt Mackall
26928ff9de
Rename merge.allow -> merge.branchmerge
2006-08-07 23:53:04 -05:00
Matt Mackall
ba80b068a7
Use demandload @ syntax
2006-08-07 23:18:16 -05:00
Matt Mackall
de047b03ce
Introduce update helper functions: update, merge, clean, and revert
2006-08-07 22:54:33 -05:00
Matt Mackall
11be1c8966
Teach demandload how to import as
2006-08-07 22:35:36 -05:00
Matt Mackall
48de6fd596
Factor doupdate into _lookup + hg.update
2006-08-07 20:54:03 -05:00
Matt Mackall
3dcc28a29a
Merge with crew
2006-08-07 16:47:06 -05:00
Vadim Gelfer
5e57b38568
commands.logmessage: simplify calling.
2006-08-07 17:23:04 -07:00
Vadim Gelfer
dc56cac613
localrepo.update: allow to suppress commit reminder.
2006-08-07 17:22:17 -07:00
Matt Mackall
d5009b5b05
Move repo.verify
2006-08-07 16:27:09 -05:00
Benoit Boissinot
dc4c4a5959
util.patch: use shellquote
2006-08-06 16:42:36 +02:00
Brendan Cully
5d7f00c97d
Add portable shell-quoting function; teach mq to use it.
2006-08-05 15:23:26 -07:00
Brendan Cully
b5f7a6230c
Add '.' as a shortcut revision name for the working directory parent.
2006-08-04 14:36:03 -07:00
Vadim Gelfer
8b999d6f47
merge with self.
2006-08-04 10:38:17 -07:00
Matt Mackall
4dc0a93fd6
revlog.lookup optimization
2006-08-03 21:24:19 -05:00
Matt Mackall
97d8934ce9
Remove **opts arg from commands.doupdate
2006-08-03 20:06:05 -05:00
Matt Mackall
65b6faa1aa
Move merge code to its own module
...
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
2006-08-03 15:24:41 -05:00
Brendan Cully
e901963dbd
Add log option --follow-first to follow only the first parent of
...
merges.
This can be useful to extract a single line of development.
2006-08-03 11:48:56 -07:00
Brendan Cully
1a2cc77cfa
Make log --follow revision range start default to working dir parent.
2006-08-03 13:29:31 -07:00
Matt Mackall
1daa0d8fba
Add a doc string
2006-08-03 13:07:57 -05:00
Brendan Cully
aec3a9ce5b
Make log --follow without a file list follow a single head.
...
This includes all the parents or children (depending on the direction
of the revision range).
2006-08-03 11:06:09 -07:00
Vadim Gelfer
338d2303a1
allow None for path of hg.repository
2006-08-02 12:46:00 -07:00
Vadim Gelfer
3e92464f80
clone: replace long help string of inaky with doc comment.
2006-08-01 19:58:34 -07:00
Inaky Perez-Gonzalez
b5488dcd48
Breakup clone -r extra text help to fit in 80 columns
2006-08-01 11:12:34 -07:00
Inaky Perez-Gonzalez
3c5b91fa37
Expand clone help with hardlink information
2006-08-01 09:50:30 -07:00
Christian Ebert
68ecb33563
fix hg backup option recommendation for auto-merge
2006-08-02 03:17:06 +02:00
Vadim Gelfer
74f5dcdc3d
import: make patch apply if run in subdir
...
fix is same as for mq patch. patch apply code should be merged.
2006-08-01 15:51:13 -07:00
Brendan Cully
5cdd0343d1
Check for parent/mod as well as parent.mod in findext.
...
Debian/Ubuntu ship a system-wide hgrc that loads extensions using
the syntax hgext/extension=, rather than hgext.extension=. Although
the extensions work correctly, hg help <extension> doesn't
understand this form without this patch.
2006-08-01 14:56:54 -07:00
Vadim Gelfer
6569e6bb76
import: switch from application/x-patch to text/x-diff
...
christian ebert says his mailer was broken.
2006-07-31 12:02:13 -07:00
Vadim Gelfer
fed53854c7
log: add -f/--follow option, to follow rename/copy
2006-07-31 07:31:31 -07:00
Vadim Gelfer
b7a96d1742
clean up hg.py: move repo constructor code into each repo module
2006-07-31 07:11:12 -07:00
Vadim Gelfer
c39398b49b
merge with mpm.
2006-07-30 22:52:34 -07:00
Matt Mackall
fb73e75b58
Kill ui.setconfig_remoteopts
...
This brought too much knowledge about command line particulars into
the ui code. Moved to commands.py.
2006-07-31 00:47:43 -05:00
Vadim Gelfer
fc31092ae7
pull: allow to pull from bundle file without need for bundle: syntax
2006-07-30 21:46:38 -07:00
Christian Ebert
8692e17b6e
fix output file format %r
2006-07-29 18:15:08 +02:00
Vadim Gelfer
0aa0ec43d9
import: allow application/x-patch for funny patch from christian ebert
2006-07-30 21:24:06 -07:00
Vadim Gelfer
96182c9dcc
merge with crew.
2006-07-28 10:47:02 -07:00
