Commit Graph

1383 Commits

Author SHA1 Message Date
Patrick Mezard
bfc0212349 Test subversion branches conversion 2008-01-17 23:46:56 +01:00
Matt Mackall
a68910fcf1 transactions: don't show a backtrace when journal exists
Now we simply print a message on how to recover.
2008-01-16 11:32:25 -06:00
Matt Mackall
11423d02c7 diff: don't show function name by default
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
2008-01-16 11:14:24 -06:00
Giorgos Keramidas
ce5f6f93a6 Display debugstate dates as '%Y-%m-%d %H:%M:%S' 2008-01-11 23:30:56 +02:00
Matt Mackall
262c766059 merge: add a bit more sanity to divergent copy checks 2008-01-14 16:28:32 -06:00
Christian Ebert
3cecc890c2 keyword: test that expansion is done filewise
Checks issue fixed in e56f3648b9a0.
2008-01-11 23:36:56 +01:00
Thomas Arendsen Hein
3b2b9afe52 Solaris compatibility fixes for test-keyword:
- do not use /bin/false (yields 255 instead of 1)
- do not use "cd -", simply use "cd .." instead.
2008-01-14 09:00:23 +01:00
Edouard Gomez
a51d1ef742 convert: separate trunk detection from branch layout detection
In some subversion repositories, trunk is present but no branches
are used. The current code is assuming that both trunk and branches
must exist before adding trunk's head to the heads list.

It's just better to separate the branch layout stuff from the trunk one.
2008-01-05 01:51:21 +01:00
Patrick Mezard
d1c841154d Merge with crew-stable 2008-01-12 20:49:07 +01:00
Patrick Mezard
2d2126f043 patch: handle empty vs no file in git patches (issue906) 2008-01-12 19:35:11 +01:00
Will Maier
213ea70ab4 Don't use the -i option with sed
This patch fixes test-keyword on platforms without GNU sed (like
OpenBSD).
2008-01-09 10:00:18 -06:00
Jesse Glick
500b64344a Issue #880: Simple misspelling ('occured') in web error message. 2008-01-05 15:35:46 -05:00
Michele Cella
0e20a92c0f adding "prefix" option to "hg serve" (command line and [web] section)
allows "hg serve" to serve from a different path than '/' (server root)
2008-01-09 11:15:00 +01:00
Maxim Dounin
690088d7ef test-mq-header: don't fail with different patch(1)
At least under FreeBSD patch(1) won't fail on empty patch and will print
'Hmm...' warning instead. Sanitize output so tests won't fail unexpectedly.
2008-01-08 06:56:21 +03:00
Matt Mackall
e834530a71 Fix up tests for XHTML validation bits 2008-01-08 15:56:12 -06:00
Christian Ebert
459ae2dd85 keyword: add test 2008-01-04 18:22:39 +01:00
Alexandre Vassalotti
60c2f6f43d restore branch after rollback (issue 902) 2008-01-07 15:26:12 -06:00
Maxim Dounin
4d9877b4eb Fix copies reporting in log and convert.
If copy logged in file revision, we report copy for changeset only
if file revisions linkrev points back to the changeset in question
or both changeset parents contain different file revisions.

This fixes extra copies reported when executable bit was changed for
previously copied file.
2007-12-29 17:11:48 +03:00
Maxim Dounin
940a0afd31 context: preserve changeset in filectx if we have one
If we know original changeset we are working with - try hard to
preserve it. Fallback to filelog.linkrev() only if we have no way
to get original changeset, since linkrev() may point to other
changeset.
2007-12-29 16:57:43 +03:00
Patrick Mezard
d6fbb24257 test-convert-hg-svn: make it more windows friendly 2008-01-05 17:36:16 +01:00
Patrick Mezard
7bfa89c3df test-convert-svn-sink: wrap repetitive svn checks in a function 2008-01-05 17:36:16 +01:00
Patrick Mezard
336268093f Merge with crew-stable 2008-01-05 22:52:28 +01:00
Patrick Mezard
47378bdecc Make run-tests.py --interactive work on Windows 2008-01-05 17:55:16 +01:00
Patrick Mezard
4200777a7b test-convert: test before() and after() conversion actions 2008-01-04 23:43:55 +01:00
Patrick Mezard
afdb5ad6e2 test-convert-svn-source: test convert/multiple extra fields 2008-01-04 23:43:55 +01:00
Bryan O'Sullivan
497bf2ca7a fetch: hide authentication details 2008-01-04 11:58:27 -08:00
Peter Arrenbrecht
30621bccda mq: add --currentdate and --date options to qnew and qrefresh
These options make qnew add and qrefresh update a "# Date "-style
header line. This allows proper recording of creation / last
modification dates of patches in patch queues.

Note that `qrefresh -D` only updates existing header lines. It never
adds them, and does not warn about this. This is because I expect
people to have `[default] qrefresh -D` in their .hgrc so patches with
tracked dates get updated, others are left unchanged. The suggested
setup in .hgrc is, in fact,

  [default]
  qnew = -D -U
  qrefresh = -D

I tried to not mix header styles, so `qnew -D -U` now writes the user in
"# User "-style, while `qnew -U` still writes it "From: "-style. Also, if
`qrefresh -U` must add the user, it does so in "# User "-style if the
header contains a "# HG changeset patch" line. (This is caused by mq
not supporting the "Date: "-style header line at all - a reasonable choice
given its standard date format.)
2008-01-02 16:24:13 +01:00
Kevin Christen
1b023c6158 Fixed XHTML validation errors 2008-01-03 13:39:26 -06:00
Thomas Arendsen Hein
35cbed7baa Move aliases section in help below synopsis (issue362)
This should avoid confusion why e.g. "hg help co" shows help
for "hg update" instead.
2008-01-02 20:22:10 +01:00
Patrick Mezard
2c5d3eddb4 test-convert-svn-source: test stop revision 2008-01-01 23:12:48 +01:00
Thomas Arendsen Hein
fdf4576462 Obfuscate (instead of just escape) contact/owner in gitweb summary.
This could contain an email address.
2008-01-01 17:12:37 +01:00
Thomas Arendsen Hein
1566cda979 Don't let ui.username override web.contact (issue900)
63beab327d26 introduced using ui.username before web.contact, but this was
never documented and might cause commit accidents.

- Drop web.author (deprecated since 2005)
- Try ui.username or $EMAIL as a fallback to display something useful.
- Update docs for the fallbacks.
2008-01-01 17:07:15 +01:00
Matt Mackall
6b6b2e0e73 bisect: improve tests
- test skipping
- test noupdate
- test bad->good search
- test inconsistent state
2007-12-31 18:20:34 -06:00
Matt Mackall
917f5ce70a bisect: handle search for bad to good transitions
Automatically detect whether we're looking for a bad to good
transition rather than the usual good to bad transition by detecting
when badrev is inside the good set and flipping good/bad.
2007-12-31 18:20:34 -06:00
Matt Mackall
bee8b54b36 bisect: make bisect a built-in command 2007-12-31 18:20:34 -06:00
Matt Mackall
ecc644d5d1 Merge backout 2007-12-31 18:20:25 -06:00
Matt Mackall
62cb860a38 Backed out changeset f019d9201ff4
Unfortunately, this breaks backward compatibility.
2007-12-31 17:47:02 -06:00
Thomas Arendsen Hein
fd0ebb6a0c Show number of changesets written to bundle files by default (issue569)
This was only shown with -v before.
2007-12-30 19:46:13 +01:00
Thomas Arendsen Hein
2be743c9ed "C" status code considered harmful, so changed to "=" (issue899)
C means conflict in other SCMs, and = is more intuitive anyway.
2007-12-30 17:45:26 +01:00
Thomas Arendsen Hein
087cac8a21 Adjust changed test output after 24f7cb0e6b71 (trailing whitespace) 2007-12-30 17:36:49 +01:00
Thomas Arendsen Hein
347da85c36 Removed tabs and trailing whitespace in python files 2007-12-29 19:49:48 +01:00
Thomas Arendsen Hein
d63fbb0105 merge with crew 2007-12-28 17:10:57 +01:00
Thomas Arendsen Hein
8dbd54d63d Clarify some messages during commit:
- use "branch 'foo'" to distinguish from "branch merge".
- commit messags can be empty (to abort commits)
- Added value for editor message: Tell about HG: lines like CVS does.
2007-12-28 17:10:25 +01:00
Patrick Mezard
f7a359686e Merge with crew-stable 2007-12-28 16:46:44 +01:00
Thomas Arendsen Hein
f1499b31ef merge with crew 2007-12-28 16:32:14 +01:00
Patrick Mezard
d9be0f3383 Prompt for a commit message in editor, improve error message 2007-12-28 14:51:16 +01:00
Patrick Mezard
0f68a55738 patchbomb: make --bundle respect --desc 2007-12-27 22:40:07 -06:00
Patrick Mezard
d404bfca4f test-convert-cvs: force cvs -f options to avoid cvsrc
There are some reference to a CVS_OPTIONS environment variable doing that but
it does not work on my system (cvs 1.11.20, macosx).
2007-12-27 19:23:22 +01:00
Thomas Arendsen Hein
e6f1571179 Tests for 2d14cb7e2a9e and a60a6bd11ed6 (interactive prompts during merge) 2007-12-27 13:39:03 +01:00
Maxim Dounin
54de122616 convert: svn-sink: copy and set properties after adding dirs/files
We can't store properties for files we haven't added to repo. Similarly,
we can't copy file to directory we haven't added to svn yet. Remember
needed changes and apply them in putcommit().
2007-12-27 03:14:46 +03:00