<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><div>On Oct 18, 2012, at 8:22 AM, <a href="mailto:dsp@php.net">dsp@php.net</a> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>On 10/18/2012 05:31 AM, Kevin Bullock wrote:<br><blockquote type="cite"># HG changeset patch<br></blockquote><blockquote type="cite"># User Kevin Bullock <<a href="mailto:kbullock@ringworld.org">kbullock@ringworld.org</a>><br></blockquote><blockquote type="cite"># Date 1350509563 18000<br></blockquote><blockquote type="cite"># Node ID 2a50542fd0a2626b1e7bdab5b35d32220f4bbb7f<br></blockquote><blockquote type="cite"># Parent de8aa47d28efd29ecdeaeb03f8cc49dc15650fb9<br></blockquote><blockquote type="cite">bookmarks: disallow bookmarks named 'tip', '.', or 'null'<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">This makes bookmarks reject the same reserved names as tags and branches.<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py<br></blockquote><blockquote type="cite">--- a/mercurial/bookmarks.py<br></blockquote><blockquote type="cite">+++ b/mercurial/bookmarks.py<br></blockquote><blockquote type="cite">@@ -15,6 +15,8 @@ def checkvalid(mark):<br></blockquote><blockquote type="cite"> if c in mark:<br></blockquote><blockquote type="cite"> raise util.Abort(_("bookmark '%s' contains illegal "<br></blockquote><blockquote type="cite"> "character" % mark))<br></blockquote><blockquote type="cite">+ if mark in ['tip', '.', 'null']:<br></blockquote><blockquote type="cite">+ raise util.Abort(_('the name \'%s\' is reserved') % mark)<br></blockquote><br>is there a reason not to use _("the name '%s' is reserved") and thus<br>don't have to escape ' ?<br></div></blockquote></div><div><br></div><div>This was just a copy+paste from the branch checking code (in dirstate.setbranch()). If I'd typed it from scratch (or been a bit more awake when I copied it), I would've used double-quotes. If (when?) this series goes thru another revision I'll change it.</div><br><div>
<span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; "><span class="Apple-style-span" style="orphans: 2; text-align: -webkit-auto; text-indent: 0px; widows: 2; -webkit-text-decorations-in-effect: none; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">pacem in terris / мир / शान्ति / سَلاَم / 平和</div><div style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Kevin R. Bullock<br></div></span></span>
</div>
<br></body></html>