- Feb 17, 2011
-
-
Steve Losh authored
-
- Feb 16, 2011
-
-
Augie Fackler authored
-
- Feb 17, 2011
-
-
Martin Geisler authored
-
Martin Geisler authored
-
- Feb 16, 2011
-
-
Wagner Bruna authored
-
Wagner Bruna authored
-
Kevin Bullock authored
This changes the prompts on git subrepos to show only the first seven digits of git changeset IDs (as git's command line does): $ hg update subrepository sources for s differ (in checked out version) use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?
-
Matt Mackall authored
-
Adrian Buehlmann authored
We can stop pretending that we have to support anything else than '/' for concatenating path elements anywhere. Windows deals just fine with '/' in file paths and we already have plenty of places which produce paths containing '/' anyway when running on Windows.
-
David Soria Parra authored
We restrict : to 1. make it easer to convert bookmarks to git branches, 2. use : later for a syntax to push a local bookmark to a remote bookmark of a different name. \0, \n, \r are fobbidden they are used to separate bookmarks in the bookmark file. This change breaks backward compatbility as ':' was an allowed character in previous versions.
-
kiilerix authored
-
kiilerix authored
These tests fails for me with Python 2.6(.nothing)
-
kiilerix authored
-
kiilerix authored
-
kiilerix authored
-
kiilerix authored
We use self.ui unconditionally anyway so we would have noticed if it in some cases wasn't set.
-
kiilerix authored
hgweb requires OpenSSL for serving https.
-
- Feb 09, 2011
-
-
Erik Zielke authored
Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
-
- Feb 16, 2011
-
-
David Soria Parra authored
-
David Soria Parra authored
-
Martin Geisler authored
-
- Feb 09, 2011
-
-
Erik Zielke authored
-
- Feb 03, 2011
-
-
Martin Geisler authored
These result lists were only built for the side effects, and so a normal loop is just as good and more straight-forward.
-
- Feb 15, 2011
-
-
Patrick Mezard authored
The default behaviour is to commit subrepositories with uncommitted changes. In my experience this is usually undesirable: - Changes to dependencies are often debugging leftovers - Real changes should generally be applied on the source project directly, tested then committed. This is not always possible, subversion subrepos may include only a small part of the source project, without the tests. Setting ui.commitsubrepos=no will now abort commits containing such modified subrepositories like: $ hg --config ui.commitsubrepos=no ci -m msg abort: uncommitted changes in subrepo sub I ruled out the hook solution because it does not easily take --include/exclude options in account. Also, my main concern is whether this flag could cause problems with extensions. If there are legitimate reasons for callers to override this behaviour (I could not find any), they might either override at ui level, or we could add an argument to localrepo.commit() later. v2: - Renamed ui.commitsubs to ui.commitsubrepos - Mention the configuration entry in hg help subrepos
-
Matt Mackall authored
-
André Sintzoff authored
-
Adrian Buehlmann authored
instead of open() and os.unlink() Avoids potential issues with file access on Windows (e.g. AV-scanners).
-
Kevin Bullock authored
Clarifies the help text for the bookmarks command regarding the requirements for pushing or pulling bookmarks.
-
jfh authored
In testing of my recent addition of a debugignore command, some of my MacHg users uncovered the exceptional case that if there is no ignore patterns of any kind then a traceback occurred. Catch and fix this case.
-
kiilerix authored
-
kiilerix authored
Test paths are now hidden by the test framework, so HG_URL no longer needs mangling.
-
kiilerix authored
There was a trailing '/' too much when the wildcard part expanded to nothing. The consequence was that the repo was announced but didn't work.
-
kiilerix authored
-
Matt Mackall authored
-
- Dec 24, 2010
-
-
Dan Villiom Podlaski Christiansen authored
Add missing calls to close() to many places where files are opened. Relying on reference counting to catch them soon-ish is not portable and fails in environments with a proper GC, such as PyPy.
-
- Feb 11, 2011
- Jan 26, 2011
-
-
Steven Brown authored
-
- Jan 15, 2011
-
-
jfh authored
For GUI clients its sometimes important to know which files will be ignored and which files will be important. This allows the GUI client to skipping redoing a 'hg status' when the files are ignored but have changed. (For instance, a typical case is that the "build" directory inside some project is ignored but files in it frequently change.)
-
- Feb 04, 2011
-
-
Gastón Kleiman authored
The patch changes the output of "hg diff --stat" when one file whose filename has spaces has changed, making it get the full filename instead of just the substring between the last space and the end of the filename. It also changes the diffstat generated by "hg email -d" when one of the commit messages starts with "diff". Because of the regex used to parse the filename, the diffstat generated by "hg email -d" will still be not correct if a commit message starts with "diff -r ". Before the patch Mercurial has the following behavior: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) After the patch: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Before the patch: $ hg add mercurial/patch.py tests/tests-diffstat.t $ hg commit -m "diffstat: fix parsing of filenames" $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] filenames | 0 mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...] After the patch: $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...]
-