Commit Graph

2066 Commits

Author SHA1 Message Date
Steve Borho
4860997ffa record: do not lose permission changes on commit 2009-01-27 09:58:48 -06:00
Matt Mackall
e0882a579f fix up tests for paths and urls help 2009-01-25 12:07:41 -06:00
Patrick Mezard
1977ae7dbb Merge with crew-stable 2009-01-25 18:58:12 +01:00
Patrick Mezard
56a4e737a8 Fix a corner case when committing a rename after a merge (issue1476) 2009-01-25 18:55:29 +01:00
Dirkjan Ochtman
4e4940dc82 templater: fix age filter to state the obvious on future timestamps 2009-01-22 16:07:44 +01:00
Dirkjan Ochtman
2976fb29b0 tests: fix issue in test-audit-path with HGTMP on OS X 2009-01-22 15:22:37 +01:00
Dirkjan Ochtman
ed55287ff1 tests: eliminate use of sed -i (which fails on NetBSD) 2009-01-22 14:33:49 +01:00
Dirkjan Ochtman
44cb61f1a6 tests: fix up tests to cope with 8d681e04a351 2009-01-22 14:32:39 +01:00
Dirkjan Ochtman
c4b462d161 merge with crew-stable 2009-01-19 12:58:01 +01:00
Stepan Koltsov
1fa2450a68 coal/paper: add missing spaces in changeset child formatting 2009-01-19 12:36:06 +01:00
Christian Ebert
5afb33fd34 notify: fix neglect of custom headers set via template
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
2009-01-15 01:38:52 +01:00
Patrick Mezard
a70c4ebc9d merge: fix execute bit update issue introduced by db8aabe14ff1 2009-01-13 22:41:06 +01:00
Patrick Mezard
7ab8b3fde9 diffstat: don't fail on merges
First version by Alexander Solovyov <piranha@piranha.org.ua>
2009-01-13 20:28:06 +02:00
Christian Ebert
4f717b637b notify: fix neglect of custom headers set via template
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
2009-01-15 01:38:52 +01:00
John Mulligan
5d89493a96 branch closing: add test for branch closing (and reopening) 2009-01-14 21:47:38 -05:00
John Mulligan
9e580fc6f7 store all heads of a branch in the branch cache
All heads of branches will be stored in a new cache file 'branchheads.cache'
within the .hg directory. The old 'branch.cache' file from older versions
will be ignored.

The new cache contents are formatted line-by-line as '{node} {branchtag}\n'.
This is the same as the previous format. Now, every head is recorded in
an oldest -> tipmost order.

The localrepo.branchheads function is reworked to use the data from the cache.
2009-01-14 21:47:38 -05:00
Bernhard Leiner
bf4052120f mq: make qnew patch format consistent with qrefresh (issue1457) 2009-01-12 09:12:35 +01:00
Matt Mackall
356502607f refactor version code
- simplify version detection code
- move detection code into setup.py
- move version reading function into util.py
- drop version.py code

This makes hg more closely follow its own recommendation of how to deal with
versioning your builds: use hg id in your build script.
2009-01-10 18:02:38 -06:00
Patrick Mezard
6aa7cd6f84 Merge with crew-stable 2009-01-13 23:17:19 +01:00
Stepan Koltsov
321c35acaa diff: add --change option to display single changeset diff (issue1420) 2009-01-13 10:44:16 +01:00
Benoit Boissinot
75e98806a7 web: use the correct filectx in filelog 2009-01-09 17:34:06 +01:00
Benoit Boissinot
9eaa24618d correctly update dirstate after update+mode change (issue1456) 2009-01-07 02:11:17 +01:00
Jason Orendorff
500c43b1e4 mq: don't warn about ambiguous patch name when using patch index (issue1439) 2009-01-06 10:30:22 +01:00
Patrick Mezard
cfa7c44e4c convert/gnuarch: fix switched copy source and destination
Reported by Edouard Gomez <ed.gomez@free.fr>
2009-01-05 14:34:20 +01:00
Patrick Mezard
c8f0bb9bb7 mq: drop copy records when refreshing regular patches (issue1441)
Copy information was saved in a common loop, then refined in a git-only block.
The problem was the latter did filter out renames occuring in the current
patch and irrelevant to commit. In the non-git case, copy records still existed
in the dirstate, referencing removed files, making the commit to fail. Git and
non-git copy handling paths are now separated for simplicity.

Reported by Gary Bernhardt
2009-01-04 21:32:40 +01:00
Dirkjan Ochtman
074cf082f4 hgweb: fix problems with empty repositories 2009-01-04 19:10:42 +01:00
Patrick Mezard
7930704b3e localrepo: fix bad manifest delta generation (issue1433)
The issue came from the 63f9ab8034d1 fix for issue586 working only for
manifest.add() fast path, where the incorrect removed file set was
ignored. This path was no longer taken after 5958346d119e refactoring.
2009-01-03 20:16:10 +01:00
Mark Edgington
fcbe766152 hgweb: send HTTP unauthorized error when denying pull 2009-01-03 20:50:06 +01:00
Martin Geisler
dc4fd3bf46 mq: lowercase output
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
2009-01-03 17:15:21 +01:00
Stefan Ring
171ebe0873 Improved hgweb test.
The hgweb fix in dc83349025f7 aimed at restoring the "back" link in hgweb's
filelog that has been lost in 81d0ede3de31. However, the previous version of
this test ran the filelog command on a file with only a single filelog entry.
In this case, the previous hgweb version did not exhibit the bug. The error
condition is now correctly tested with a filelog of 2 entries.
2009-01-12 13:20:09 +01:00
Dirkjan Ochtman
e53eace7ea tests: use killdaemons.py in test-highlight 2009-01-12 09:57:52 +01:00
Dirkjan Ochtman
aabce1d60c mq: allow qpop if popped revisions are not working dir parents 2009-01-12 09:07:02 +01:00
Dirkjan Ochtman
b62067242a merge with crew-stable 2009-01-12 09:13:45 +01:00
Benoit Boissinot
6b71924a1b merge with -stable 2009-01-09 18:12:53 +01:00
Benoit Boissinot
b3e502e61c merge with -stable 2009-01-07 02:13:32 +01:00
Dirkjan Ochtman
7898fef4da merge with crew-stable 2009-01-06 10:33:57 +01:00
Dirkjan Ochtman
03e3ada916 tests: shrink wait interval for test-convert-bzr-merges 2009-01-05 18:45:20 +01:00
Patrick Mezard
cdcf39e446 Merge with crew-stable 2009-01-05 14:37:46 +01:00
Marek Kubica
3a78577a8b tests: try to prevent different ordering in test-convert-bzr-merges 2009-01-05 12:31:00 +01:00
Benoit Boissinot
722aaa1329 merge with crew 2009-01-04 21:49:37 +01:00
Patrick Mezard
93125a20b3 Merge with crew-stable 2009-01-04 21:44:06 +01:00
Frank Kingswood
c52ddbe980 test: added testcase for cvsps log message lookahead 2009-01-04 10:06:44 +00:00
Dirkjan Ochtman
ad878f12a5 merge with crew-stable 2009-01-04 19:13:02 +01:00
Benoit Boissinot
f1393e61f3 merge with crew 2009-01-04 13:52:28 +01:00
Peter Arrenbrecht
cbd55becad test-audit-path: add one more test (issue 1450) 2009-01-04 08:06:05 +01:00
Patrick Mezard
66fcf68fa2 Merge with crew-stable 2009-01-03 21:54:58 +01:00
Dirkjan Ochtman
823b43d5b5 tests: use killdaemons.py in test-pull-http 2009-01-03 20:20:40 +01:00
Dirkjan Ochtman
25cd3135ab merge with crew-stable 2009-01-03 21:24:31 +01:00
Martin Geisler
cbcd677f60 lowercase ui.debug and assert output
This does not effect the log or status commands and should be okay
according to the compatibility rules.
2009-01-03 17:15:21 +01:00
Martin Geisler
23608038bf lowercase help output
Changes docstrings to begin with a lowercase word. Only docstrings
used in help output is changed.

Scripts are not expected to grep the output of 'hg help' so this
change should pose no problem with regard to the compatibility rules.
2009-01-03 17:15:15 +01:00