Matt Mackall
cf71bb5f2b
hgweb: fix merge breakage
2008-03-31 23:14:25 -05:00
Matt Mackall
bf098a66ae
templates: add coal web theme
2008-03-31 21:49:36 -05:00
Matt Mackall
233304547d
optimize PNGs
2008-03-31 21:49:34 -05:00
Matt Mackall
1cca88367c
hgweb: minor improvements for new web style
...
- make renamelink take a context
- pass current node to shortlog page rather than tip
- pass user/desc/date/rename to filediff
- improve template error reporting for foo%bar
2008-03-31 21:49:33 -05:00
Matt Mackall
96d3666c86
add simple dump and undump scripts to contrib/
2008-03-31 21:49:32 -05:00
Matt Mackall
74e8b50e35
Merge with stable
2008-03-31 21:49:26 -05:00
Benoit Boissinot
945728f10a
merge with crew
2008-03-31 18:49:15 +02:00
Benoit Boissinot
8042e0ac71
hg serve: add clearer message when starting the server with --verbose
...
Explicitly tell the address is the one the process is bound to.
Fix the printing of IPv6 addresses.
2008-03-31 18:44:12 +02:00
Dirkjan Ochtman
61daef971b
convert: fix trailing space introduced in d44685e2377e
2008-03-31 13:10:47 +02:00
David Soria Parra ext:(%20php.net%3E)
b9cec105a4
pager: Add a configuration to enable/disable the pager for certain commands
...
Add the configuration options pager.ignore and pager.attend.
You can disable the pager on certain commands by adding them to the
pager.ignore setting. To whitelist commands, you can add them to pager.attend.
To disable or enable global commands like 'hg version' or 'hg help'
you have to use your global .hgrc. (thanks, Matt Mackall)
2008-03-29 19:41:50 +01:00
Christian Ebert
8d6395cf2d
keyword: regroup monkey patch code, underscore prefix private vars
2008-03-31 11:08:52 +02:00
Thomas Arendsen Hein
c416d6153f
merge with crew-stable
2008-03-31 00:01:27 +02:00
Thomas Arendsen Hein
330a183096
Fix test-convert-svn-tags on case sensitive filesystems
2008-03-30 23:58:02 +02:00
Benoit Boissinot
2a79bac3c3
fix bug introduced by 3036384ac63a (thanks pychecker)
2008-03-30 22:29:02 +02:00
Benoit Boissinot
199def92ce
merge with -stable
2008-03-30 22:23:55 +02:00
Benoit Boissinot
574729489c
fix bug introduced by 4858a155c4aa (short not defined)
2008-03-30 22:22:53 +02:00
Benoit Boissinot
82208cae06
merge with crew
2008-03-30 20:31:35 +02:00
Patrick Mezard
e66a2c195c
Merge with crew-stable
2008-03-30 20:25:22 +02:00
Benoit Boissinot
9ac6d264fb
fix warning from pychecker
2008-03-30 20:21:57 +02:00
Benoit Boissinot
46509e2ba0
fix error spotted by pychecker
2008-03-30 20:21:46 +02:00
Benoit Boissinot
ce5f0b5ec6
fix error spotted by pychecker
2008-03-30 20:21:46 +02:00
Patrick Mezard
2a688097e7
commands: fix shadowed repo module
2008-03-30 20:18:40 +02:00
Benoit Boissinot
60b35838c0
merge with crew
2008-03-29 21:15:54 +01:00
Benoit Boissinot
f193be73bd
hgweb: remove dead code
2008-03-29 21:15:34 +01:00
Matt Mackall
52b4d9ec25
copies: refactor symmetricdifference as _findlimit
...
We only need to track the lowest revision seen, which makes things simpler.
2008-03-29 12:39:47 -05:00
Matt Mackall
95434837e1
copies: teach symmetric difference about working revisions
...
- use changelog.count() as a pseudo revision number
- abort early in copies if revs are the same
- eliminate working dir hacks in copies
- yield results as they're found
2008-03-29 12:39:47 -05:00
Matt Mackall
56e621f7bc
symmetricdifference: move back to copies
...
It's too tightly dependent on known revlog ordering to fit well in ancestors
2008-03-29 12:39:47 -05:00
Matt Mackall
ab64062215
symmetricdifference: change colors to sides
2008-03-29 12:39:47 -05:00
Matt Mackall
469b176973
ancestors: simplify symmetric difference
...
- n_wanted/wanted -> interesting
- scan colors rather than managing ret
2008-03-29 12:39:47 -05:00
Matt Mackall
ba8f438e7a
copies: don't double-detect items in the directory copy check
2008-03-29 12:39:47 -05:00
Matt Mackall
c9895536f8
copies: skip directory rename checks when not merging
...
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
2008-03-29 12:39:47 -05:00
Matt Mackall
1b20d834b6
copies: sort old names by depth
2008-03-29 12:39:47 -05:00
Matt Mackall
8a7d38f2e2
backout: reverse changeset belongs on current branch
...
Backing out a changeset that is before a named branch branchpoint was
making the reverse changeset the tip of the old branch, which is wrong
and very confusing. So instead, we put it on the current named branch.
2008-03-29 12:39:47 -05:00
Matt Mackall
fc40a37304
copies: fix silly precedence bug
2008-03-29 12:39:47 -05:00
Patrick Mezard
a01f6bda6d
Merge with crew-stable
2008-03-29 17:27:35 +01:00
Patrick Mezard
d556aa96d4
test-convert-svn-source: remove redundant tests
2008-03-29 17:16:39 +01:00
Patrick Mezard
664a12a36c
convert: allow tags detection to be disabled
...
Tags calculation becomes more reliable but slower, measurable on frequent
synchronizations.
2008-03-29 17:16:18 +01:00
Patrick Mezard
686a0f8465
convert: follow svn tags history (issue953)
2008-03-29 17:15:45 +01:00
Patrick Mezard
05b7b4915e
Add a test for svn tags conversion
2008-03-29 17:15:43 +01:00
Patrick Mezard
f6b95792a5
convert: avoid svn log retrieval process cleanup
...
With huge history (like kdelibs), the process termination suddenly consumes a
lot of memory (from 700M to 1.3G+). Since the job is done, clean termination is
not required, just exit.
2008-03-29 17:14:53 +01:00
Patrick Mezard
da284c98c8
test-convert-mtn: test directory deletion
2008-03-29 17:14:47 +01:00
Benoit Boissinot
5e3666db4b
fix const annotation warning
2008-03-28 19:47:22 +01:00
Dirkjan Ochtman
5e4724ae4e
highlight: some small cleanups
2008-03-28 17:31:50 +01:00
Dirkjan Ochtman
ef391be22f
hgweb: refactor hgweb code
2008-03-28 19:40:44 +01:00
Dirkjan Ochtman
9c32b06e9a
hgweb: separate out utility functions
2008-03-28 19:37:28 +01:00
Kirill Smelkov
b3208d45a6
churn: allow whitespaces as delimiter in aliases
...
it was exactly on space character before.
2008-03-28 11:17:10 +03:00
Matt Mackall
fca88d72ac
Added signature for changeset 564441983cb9
2008-03-24 18:05:30 -05:00
Bryan O'Sullivan
c8e33b9c63
Tests for issue 1049
2008-03-24 15:50:58 -07:00
Bryan O'Sullivan
776bc63f5b
commit: when committing the results of a merge, it's all or nothing
...
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
2008-03-24 15:36:56 -07:00
Thomas Arendsen Hein
ae74a1c929
Skip older monotone versions for tests.
...
test-convert-mtn is known to work with 0.37 and 0.38, but fails with
0.31 (Debian etch). hghave now skips all versions up to 0.31.
2008-03-24 22:49:33 +01:00
