mercurial/templates/rss/error.tmpl
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Wed, 05 Nov 2014 23:24:47 +0900
changeset 23183 51c9196a6bd0
parent 9999 f91e5630ce7e
child 26421 4b0fc75f9403
permissions -rw-r--r--
largefiles: remove meaningless code path for "hg pull --rebase" This patch removes "--rebase" specific code path for "hg pull" in "overridepull", because previous patch makes it meaningless: now, "rebase.rebase" ("orig" invocation in this patch) can update/commit largefiles safely without "repo._isrebasing = True". As a side effect of removing "rebase.rebase" invocation in "overridepull", this patch removes "nothing to rebase ..." message in "test-largefiles.t", which is shown only when rebase extension is enabled AFTER largefiles: before this patch: 1. "dispatch" invokes "pullrebase" of rebase as "hg pull" at first, because rebase wraps "hg pull" later 2. "pullrebase" invokes "overridepull" of largefiles as "orig", even though rebase assumes that "orig" is "pull" of commands 3. "overridepull" executes "pull" and "rebase" directly 3.1 "pull" pulls changesets and creates new head "X" 3.2 "rebase" rebases current working parent "Y" on "X" 4. "overridepull" returns to "pullrebase" 5. "pullrebase" tries to rebase, but there is nothing to be done, because "Y" is already rebased on "X". then, it shows "nothing to rebase ..." after this patch: 1. "dispatch" invokes "pullrebase" of rebase as "hg pull" 2. "pullrebase" invokes "overridepull" of largefiles as "orig" 3. "overridepull" executes "pull" as "orig" 4. "overridepull" returns to "pullrebase" 5. revision "Y" is not yet rebased, so "pullrebase" doesn't shows "nothing to rebase ..." As another side effect of removing "rebase.rebase" invocation, this patch fixes issue3861, which occurs only when rebase extension is enabled BEFORE largefiles: before this patch: 1. "dispatch" invokes "overridepull" of largefiles at first, because largefiles wrap "hg pull" later 2. "overridepull" executes "pull" and "rebase" explicitly 2.1 "pull" pulls changesets and creates new head "X" 2.2 "rebase" rebases current working parent, but fails because no revision is checked out in issue3861 case 3. "overridepull" returns to "dispatch" with exit code 1 returned from "rebase" at (2.2) 4. "hg pull" terminates with exit code 1 unexpectedly after this patch: 1. "dispatch" invokes "overridepull" of largefiles at first 2. "overridepull" invokes "pullrebase" of rebase as "orig" 3. "pullrebase" invokes "pull" as "orig" 4. "pullrebase" invokes "rebase", and it fails 5. "pullrebase" returns to "overridepull" with exit code 0 (because "pullrebase" ignores result of "pull" and "rebase") 6. "overridepull" returns to "dispatch" with exit code 0 returned from "rebase" at (5) 7. "hg pull" terminates with exit code 0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7748
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     1
{header}
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     2
    <title>Error</title>
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     3
    <description>Error</description>
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     4
    <item>
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     5
      <title>Error</title>
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     6
      <description>{error|escape}</description>
8936
1de6e7e1bb9f change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7750
diff changeset
     7
      <guid>http://mercurial.selenic.com/#error</guid>
7748
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     8
    </item>
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
     9
  </channel>
09bec6fd747c hgweb: add rss error template
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
    10
</rss>