Commits

Author Commit Message Labels Comments Date
Wagner Bruna
i18n-pt_BR: synchronized with 71c1513fd560
Branches
stable
Adrian Buehlmann
clone: show status "updating to bookmark @" if bookmark @ is not on the default branch, we show updating to bookmark @ on branch <name>
Branches
stable
Adrian Buehlmann
test-clone: fix directory level 92980a8dfdfe inserted a "cd a" but didn't restore the previous directory.
Branches
stable
Julian Cowley
patchbomb: -c is not an alias for the --confirm option The help text shows "-c/--confirm", which implies that -c is an alias for --confirm. Actually, it is an alias for --cc. Correct the text by removing -c.
Branches
stable
Bryan O'Sullivan
dirstate: handle dangling junctions on windows (issue2579)
Branches
stable
Matt Harbison
largefiles: don't copy largefiles from working dir to the store while converting Previously, if one or more largefiles for a repo being converted were not in the usercache, the convert would abort with a reference to the largefile being missing (as opposed to the previous patch, where the standin was referenced as missing). This is because commitctx() tries to copy all largefiles to the local store, first from the user cache, and if the file isn't found there, from the workin…
Branches
stable
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630) When the rev isn't specified, the standin for the working copy gets read. But convert doesn't update the working copy for each cset it processes, so there is no standin and the 'hg convert' would abort complaining about the standin being missing. Note that if the largefile is not in the user cache, 'hg convert' complains about the largefile itself missing from the destination repo.
Branches
stable
Simon H.
subrepo: subrepo isolation, pass baseui when cloning a new subrepo (issue2904) Create the repo with baseui because it should only get the global configuration. After this patch issue2904 is finally fixed.
Branches
stable
Simon H.
subrepo: more isolation, only use ui for hg.peer when there is no repo ui contains repo specific configuration, so do not use it when there is a repo. But pass it to hg.peer when there is no repo. Then it only contains global configuration.
Branches
stable
Simon H.
peer: subrepo isolation, pass repo instead of repo.ui to hg.peer Do not pass ui because it contains the configuration of the repo. It is the same object as repo.ui. When a repo is passed to hg.peer, the global configuration is read from repo.baseui.
Branches
stable
Katsunori FUJIWARA
subrepo: isolate configuration between each repositories in subrepo tree Before this patch, repository local configurations are not isolated between repositories in subrepo tree, because "localrepository" objects for each subrepositories are created with "ui" instance of the parent of each ones. So, local configuration of the parent or higher repositories are visible also in children or lower ones. This patch uses "baseui" instead of "ui" to create repository object:…
Branches
stable
Matt Mackall
bookmarks: backed out new message from changeset 52c7e171e355 Not strictly a bugfix, hasn't achieved consensus yet.
Branches
stable
Thomas Arendsen Hein
clone: print bookmark name when clone activates a bookmark Similar to the message that prints the checked out branch name. Without this, the user might accidentally move the @ bookmark.
Branches
stable
Thomas Arendsen Hein
clone: activate @ bookmark if updating to it The message "updating bookmark @ failed!" in test-bookmarks-pushpull.t is correct, because the changeset that the @ bookmark points to is not pushed to the target repository.
Branches
stable
Thomas Arendsen Hein
test-clone.t: check that branch "@" is not automatically checked out This verifies that c9339efed653 fixes the second problem mentioned in issue3677.
Branches
stable
Thomas Arendsen Hein
test-bookmarks.t: check that bookmark "default" is not automatically checked out This verifies that c9339efed653 fixes the problem originally reported in issue3677.
Branches
stable
Thomas Arendsen Hein
clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Before this change a bookmark named "default" or a branch named "@" would cause the wrong changeset to be checked out. The change in output of test-hardlinks.t is due to the fact that no unneeded tag lookups for the tags "@" or "default" happen, therefore the cache file is not created.
Branches
stable
Thomas Arendsen Hein
bookmark: simplify nodemap check introduced in the previous changeset
Branches
stable
Pierre-Yves David
bookmark: prevent crashing when a successor is unknown locally (issue3680) The `%ln` revset substitution does not accept unknown node. We prune unknown node from potential successors before computing descendants. This have no impact on the result of this function. - Descendants of unknown changeset as unknown, - all successors of unknown changesets are already return by the call who returned those same unknown changesets, - unknown changesets are never a valid destin…
Branches
stable
Pierre-Yves David
bookmark: complexity pull-push test to have deeper tree This changeset only touch test. The previous test was correct, it tested that the successors of an old bookmark position was seen as a valid destination for bookmark. However, a newer version is made for two reason: (1) The new test check further. It check that the descendant of the successors is a valid destination (2) An ever more complexe test is needed to validate a future fix to issue…
Branches
stable
Pierre-Yves David
amend: fix incompatibity between logfile and message option (issue3675) Bug introduced by 9732473aa24b
Branches
stable
Adrian Buehlmann
test-remove: adapt to differing error message on Windows On Windows, this part of the test failed with $ hg rm --after nosuch - nosuch: No such file or directory + nosuch: The system cannot find the file specified [1] Fixed by glob-ing away the error message if the test is run on Windows (see for example test-bad-pull.t line 3 for precedent). test-remove.t now passes on Windows.
Branches
stable
Adrian Buehlmann
test-remove: fix \ vs. / issues on Windows This part of the test failed with $ hg rm --after d1 - removing d1/a + removing d1\a on Windows.
Branches
stable
Bryan O'Sullivan
verify: fix all doubled-slash sites (issue3665)
Branches
stable
Thomas Arendsen Hein
patchbomb: respect --in-reply-to for all mails if no intro message is sent Before this change, the thread hierarchy looked like this: PARENT PATCH1/x PATCH2/x PATCH3/x ... Now it is: PARENT PATCH1/x PATCH2/x PATCH3/x ... With an introductory message the behaviour is unchanged: PARENT INTRO PATCH1/x PATCH2/x PATCH3/x ...
Branches
stable
Katsunori FUJIWARA
test: add test for the issue introduced by e410be860393 (issue3669) e410be860393 (released as Mercurial 2.3) introduced the issue that the revset program started with 40 hexadecimal letters caused unexpected result at "hg log" execution. This issue was already fixed by bde1185f406c (released as 2.3.1), but there is no test to examine whether this issue is certainly fixed or not: no test fails even if bde1185f406c is backed out. This patch adds test for this issu…
Branches
stable
Pierre-Yves David
obsolete: add missing line feed in debug error message
Branches
stable
Thomas Arendsen Hein
merge with stable
Thomas Arendsen Hein
localrepo: translate "push includes X changeset" only once This was introduced in 12fdaa30063a
Branches
stable
Thomas Arendsen Hein
merge stable heads
Branches
stable
  1. Prev
  2. Next