Patchwork dirstate: copyedit exception for no beginparentchange call

login
register
mail settings
Submitter Siddharth Agarwal
Date Sept. 17, 2014, 8:08 p.m.
Message ID <8b3f6c781ee228d4863c.1410984503@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/5852/
State Accepted
Headers show

Comments

Siddharth Agarwal - Sept. 17, 2014, 8:08 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1410984483 25200
#      Wed Sep 17 13:08:03 2014 -0700
# Node ID 8b3f6c781ee228d4863c1c426d55dc7abb3a0417
# Parent  48791c2bea1ceda4e4f28bc11651e281d636ce1a
dirstate: copyedit exception for no beginparentchange call
Pierre-Yves David - Sept. 17, 2014, 8:10 p.m.
On 09/17/2014 01:08 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1410984483 25200
> #      Wed Sep 17 13:08:03 2014 -0700
> # Node ID 8b3f6c781ee228d4863c1c426d55dc7abb3a0417
> # Parent  48791c2bea1ceda4e4f28bc11651e281d636ce1a
> dirstate: copyedit exception for no beginparentchange call
>
> diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
> --- a/mercurial/dirstate.py
> +++ b/mercurial/dirstate.py
> @@ -257,8 +257,8 @@
>           See localrepo.setparents()
>           """
>           if self._parentwriters == 0:
> -            raise ValueError("cannot set dirstate parent without " +
> -                " calling dirstate.begingparentchange")
> +            raise ValueError("cannot set dirstate parent without "
> +                "calling dirstate.beginparentchange")

Can we get the indentation right in the same go?
(I'll consider queing it in a few hours (when my eyes will be back from 
thier field trip)
Siddharth Agarwal - Sept. 17, 2014, 8:11 p.m.
On 09/17/2014 01:10 PM, Pierre-Yves David wrote:
>
>
> On 09/17/2014 01:08 PM, Siddharth Agarwal wrote:
>> # HG changeset patch
>> # User Siddharth Agarwal <sid0@fb.com>
>> # Date 1410984483 25200
>> #      Wed Sep 17 13:08:03 2014 -0700
>> # Node ID 8b3f6c781ee228d4863c1c426d55dc7abb3a0417
>> # Parent  48791c2bea1ceda4e4f28bc11651e281d636ce1a
>> dirstate: copyedit exception for no beginparentchange call
>>
>> diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
>> --- a/mercurial/dirstate.py
>> +++ b/mercurial/dirstate.py
>> @@ -257,8 +257,8 @@
>>           See localrepo.setparents()
>>           """
>>           if self._parentwriters == 0:
>> -            raise ValueError("cannot set dirstate parent without " +
>> -                " calling dirstate.begingparentchange")
>> +            raise ValueError("cannot set dirstate parent without "
>> +                "calling dirstate.beginparentchange")
>
> Can we get the indentation right in the same go?
> (I'll consider queing it in a few hours (when my eyes will be back 
> from thier field trip)

Sure, feel free to fix while queueing.
Pierre-Yves David - Sept. 17, 2014, 11:29 p.m.
On 09/17/2014 01:08 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1410984483 25200
> #      Wed Sep 17 13:08:03 2014 -0700
> # Node ID 8b3f6c781ee228d4863c1c426d55dc7abb3a0417
> # Parent  48791c2bea1ceda4e4f28bc11651e281d636ce1a
> dirstate: copyedit exception for no beginparentchange call

pushed to the clowncopter, thanks

Patch

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -257,8 +257,8 @@ 
         See localrepo.setparents()
         """
         if self._parentwriters == 0:
-            raise ValueError("cannot set dirstate parent without " +
-                " calling dirstate.begingparentchange")
+            raise ValueError("cannot set dirstate parent without "
+                "calling dirstate.beginparentchange")
 
         self._dirty = self._dirtypl = True
         oldp2 = self._pl[1]