Peter van Dijk
786744af57
add md5sum.py required by fix in previous changeset
2006-02-21 22:32:17 +01:00
Peter van Dijk
d57c5b4152
fix testsuite for freebsd and one timingissue
2006-02-21 22:23:51 +01:00
Alexis S. L. Carvalho
739481e8bb
AmbiguousCommand is raised too soon.
...
Right now, hg raises AmbiguousCommand as soon as it finds two
commands/aliases that start with the substring it's searching for, even
though it may still find a full match later on.
This is a bit hard to hit on purpose, because hg checks the list of
commands in whatever order is returned by table.keys(), which will
change when you add an alias to a command. You should be able to hit it
by adding an alias "u" to the "identify" command - not that that makes a
lot of sense...
2006-02-17 17:41:23 -06:00
Alexis S. L. Carvalho
0c383f1386
Don't hard-code /tmp in test-ro-message
...
This makes the test succeed when $TMPDIR is set.
2006-02-17 17:41:18 -06:00
Matt Mackall
45afdee653
Merge with crew
2006-02-17 17:39:05 -06:00
Matt Mackall
a9543f526c
Refactor excessive merge detection, add test
2006-02-17 17:23:53 -06:00
Vadim Gelfer
d1f78f49f0
add preoutgoing and outgoing hooks.
...
preoutgoing lets prevent pull over http or ssh.
outgoing lets notify after pull.
2006-02-17 08:26:21 -08:00
Vadim Gelfer
6c96629693
i forgot to change the test output for test-hook.
2006-02-16 14:34:59 -08:00
Vadim Gelfer
b843092d88
tests for new hooks. fix things i found when writing tests.
2006-02-16 09:56:31 -08:00
Vadim Gelfer
837f070f08
fix test-help diff options.
2006-02-16 09:09:45 -08:00
Vadim Gelfer
e6a0476599
merge with crew.
2006-02-16 08:51:24 -08:00
Vadim Gelfer
31409d2048
fix names of parent changeset ids in hooks.
...
fix hook part of man page.
2006-02-16 08:48:31 -08:00
Vadim Gelfer
db9761a152
prefix hook env var names with HG_.
...
old names are still provided, but doc says they deprecated.
2006-02-16 08:40:47 -08:00
Benoit Boissinot
a0fcd1a0bc
merge with crew
2006-02-15 22:37:28 +01:00
Benoit Boissinot
6dcaf620ac
add a -b/--branch option to 'hg parents'
2006-02-15 22:21:20 +01:00
Vadim Gelfer
b208eaf201
add -p option to tip. for issue 64.
2006-02-15 11:05:43 -08:00
Vadim Gelfer
aa223c7048
add prechangegroup and pretxnchangegroup hooks.
...
prechangegroup lets you stop push, pull or unbundle before it begins.
pretxnchangegroup lets you inspect changegroup before transaction is
committed, and roll back if you not like it.
2006-02-15 10:49:30 -08:00
Vadim Gelfer
07def80c7a
merge with crew.
2006-02-15 10:40:15 -08:00
Vadim Gelfer
81d4eba8eb
add -w and -p options to diff. this is for issue 126.
2006-02-15 10:39:47 -08:00
Thomas Arendsen Hein
ba28644c7c
Fix diff against an empty file (issue124) and add a test for this.
2006-02-15 14:22:16 +01:00
Benoit Boissinot
af35f643ab
catch errors and throw exception with invalid binary patch data
2006-02-15 04:37:47 +01:00
Vadim Gelfer
f15e0c4fd0
add pretxncommit hook.
...
hook allows check of changeset after create, but before transaction
is committed. hook failure rolls transaction back.
makes place for local policies like commit message must contain bug id
or reviewer signoff.
change also adds parent changeset ids to commit hook environment,
because is cheap and useful.
2006-02-14 17:13:18 -08:00
Vadim Gelfer
554cbfdbf8
add pretag and tag hooks.
...
pretag hook lets hook decide how tags can be named. tag hook is
notifier.
2006-02-14 15:47:25 -08:00
Vadim Gelfer
892612e41c
hook parameters must be strings.
2006-02-14 15:37:27 -08:00
Vadim Gelfer
5485a172bc
make hook code nicer.
...
pre hooks can raise exception if fail.
tidy up better if exception raised (like KeyboardInterrupt) when running
hook program.
2006-02-14 15:28:06 -08:00
Vadim Gelfer
c759ed599a
hooks run after transactions finish must not affect method results.
2006-02-14 15:10:45 -08:00
Matt Mackall
3c42236268
Revert convert-repo changes
2006-02-13 12:48:28 -06:00
Vadim Gelfer
977a337f0c
fix hgrc doc hook descriptions.
2006-02-11 00:31:52 -08:00
Daniel Santa Cruz
4cdd5950a7
hooks: distinguish between locally committed and incoming changes.
...
"commit" hook is now for locally committed changes only.
"incoming" is for changes pulled, pushed, or unbundled into local repo.
2006-02-10 16:45:56 -05:00
mason@suse.com
c329a8e132
Allow callers to pass in the dirstate lock in most localrepo.py funcs.
...
This makes it possible to take the lock once and commit a large number of
patches, without having to read and write the dirstate for each patch.
2006-02-09 17:18:43 -06:00
mason@suse.com
14cb4382e3
revlog.strip should clear the chunkcache
...
The chunkcache isn't valid after a strip, it needs to be cleared out.
2006-02-09 17:07:20 -06:00
Thomas Arendsen Hein
ce2485979c
Show "(No help text available)" for commands without doc string.
...
Currently this only occurs with "hg help qcommit" from mq extension.
2006-02-09 09:07:19 +01:00
Thomas Arendsen Hein
175dc64ce0
Create default commit message in a more pythonic way.
2006-02-09 07:24:34 +01:00
Thomas Arendsen Hein
9d13984cfb
Removed "HG: manifest hash" line from commit message.
2006-02-09 07:16:13 +01:00
Thomas Arendsen Hein
88c2b59c9e
Put the empty line in commit text above the branch merge line.
2006-02-09 07:14:05 +01:00
Thomas Arendsen Hein
df7f5fd30b
Run commit message editor in the repo root (like hooks).
...
This makes the hgeditor script work with hg commit -R path/to/repo
2006-02-09 07:01:23 +01:00
Johannes Stezenbach
3d04a1848f
add changenav at bottom of page
...
if one reads through the changelog and wants to go to the
previous or next page one needs the navigation links at
the bottom, not at the top of the page
2006-02-07 23:01:11 -06:00
Johannes Stezenbach
e5bc05a46d
display revision numbers
...
revision numbers are useful for orientation when browsing
through the changelog
2006-02-06 17:35:22 -06:00
Johannes Stezenbach
36f0448a9e
fix changenav for maxchanges != 10
...
for maxchanges = 25 the changelog navigation had a minimum
stepsize of 30; try to calculate more useful navigation steps
2006-02-06 17:34:53 -06:00
Johannes Stezenbach
ebb84bfa68
add --mbox output to patchbomb
...
add option to save generated mails in an mbox file for later
processing with formail, instead of sending them directly
2006-02-06 17:34:39 -06:00
Radoslaw Szkodzinski
b2b518aa1e
hgmerge: various cleanups
...
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
2006-02-06 17:32:10 -06:00
Radoslaw Szkodzinski
1eba0eaedd
hgmerge: add cleanup functions
...
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
2006-02-06 17:32:06 -06:00
Radoslaw Szkodzinski
5352dbd6fd
hgmerge: add and use more tool variables
...
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
2006-02-06 17:32:00 -06:00
Matt Mackall
35a5e349cc
Update copyright notice
2006-02-05 22:21:02 -06:00
Matt Mackall
904ecd9ca5
Merge with crew
2006-02-05 22:18:38 -06:00
Josef "Jeff" Sipek
98503dee36
[hgweb] Added rename information to gitweb templates & misc cleanups
...
Fixed up file log template's title
Removed double entry for filelogentry in gitweb map file
2006-02-05 20:52:55 -05:00
Thomas Arendsen Hein
7d93bb0429
Merge with Peter van Dijk
2006-02-03 12:58:40 +01:00
Peter van Dijk
53e2d42bd5
remove escaping from decriptions on repo index page
2006-02-03 12:56:41 +01:00
Thomas Arendsen Hein
8dc011fb10
Added raw view for file annotate in hgweb.
2006-02-03 12:50:02 +01:00
Benoit Boissinot
481a5f04df
hgweb/templates: remove unused vars from map-raw
...
annotateline contains html and it is unused
filenodelink is unused but should be defined
2006-02-03 11:54:16 +01:00
