Submitter | Durham Goode |
---|---|
Date | Sept. 5, 2014, 7:36 p.m. |
Message ID | <cbc8f6a95fd203e455c5.1409945781@dev2000.prn2.facebook.com> |
Download | mbox | patch |
Permalink | /patch/5704/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@selenic.com> X-Original-To: patchwork@patchwork.serpentine.com Delivered-To: patchwork@patchwork.serpentine.com Received: from waste.org (waste.org [173.11.57.241]) by bz.selenic.com (Postfix) with ESMTP id 49BFA3BE7E for <patchwork@patchwork.serpentine.com>; Fri, 5 Sep 2014 15:36:37 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id 312C074143; Fri, 5 Sep 2014 14:36:34 -0500 (CDT) X-Virus-Scanned: Debian amavisd-new at waste.org Received: from waste.org ([127.0.0.1]) by localhost (waste.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 9ygp-HOLl2qx; Fri, 5 Sep 2014 14:36:33 -0500 (CDT) Received: from waste.org (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id EB47B74131; Fri, 5 Sep 2014 14:36:29 -0500 (CDT) X-Original-To: mercurial-devel@waste.org Delivered-To: mercurial-devel@waste.org Received: from localhost (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id 22B2F7412E for <mercurial-devel@waste.org>; Fri, 5 Sep 2014 14:36:27 -0500 (CDT) X-Virus-Scanned: Debian amavisd-new at waste.org Received: from waste.org ([127.0.0.1]) by localhost (waste.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id pxMWL6QphQUU for <mercurial-devel@waste.org>; Fri, 5 Sep 2014 14:36:24 -0500 (CDT) Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by waste.org (Postfix) with ESMTP id A2EEE74121 for <mercurial-devel@selenic.com>; Fri, 5 Sep 2014 14:36:23 -0500 (CDT) Received: from pps.filterd (m0004060 [127.0.0.1]) by mx0b-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id s85JZOBC027309 for <mercurial-devel@selenic.com>; Fri, 5 Sep 2014 12:36:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=content-type : mime-version : content-transfer-encoding : subject : message-id : in-reply-to : references : date : from : to; s=facebook; bh=KXBDt9WrzNWztitJDWdLlQs2R0yXfiX7CmTN+6d8YT4=; b=JyZTU5nqkv7Weg1CAFy4sPnIKU34Wr5DuDbaSmUlPenFW+/sw47h18s+UJNd40lLJDoR 2NtFwgVKd6uDWnn74Zo1diCnSToWoRwLffL687HEXYMH3gSb4Cnl96x0zcevq/LRPZ7j jzqQSkGxmtavHxaOwP03Gdbro0sBaHDkLyc= Received: from mail.thefacebook.com (mailwest.thefacebook.com [173.252.71.148]) by mx0b-00082601.pphosted.com with ESMTP id 1p7gwn0fjv-2 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=OK) for <mercurial-devel@selenic.com>; Fri, 05 Sep 2014 12:36:23 -0700 Received: from mx-out.facebook.com (192.168.57.29) by PRN-CHUB02.TheFacebook.com (192.168.16.12) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 5 Sep 2014 12:36:21 -0700 Received: from dev2000.prn2.facebook.com (2401:db00:20:a011:face:0:11:0) by mx-out.facebook.com (10.223.100.97) with ESMTP id ea1b99a8353311e4b1e324be0593f280-3cbe63f0 for <mercurial-devel@selenic.com>; Fri, 05 Sep 2014 12:36:21 -0700 MIME-Version: 1.0 Subject: [PATCH 3 of 3] dirstate: add exception when calling setparent without begin/end X-Mercurial-Node: cbc8f6a95fd203e455c5acd0cf6f6006663af52f X-Mercurial-Series-Index: 3 X-Mercurial-Series-Total: 3 Message-ID: <cbc8f6a95fd203e455c5.1409945781@dev2000.prn2.facebook.com> X-Mercurial-Series-Id: <8c6d502c92c8ed8dfa79.1409945779@dev2000.prn2.facebook.com> In-Reply-To: <8c6d502c92c8ed8dfa79.1409945779@dev2000.prn2.facebook.com> References: <8c6d502c92c8ed8dfa79.1409945779@dev2000.prn2.facebook.com> User-Agent: Mercurial-patchbomb/3.1+86-d34058dd3246 Date: Fri, 5 Sep 2014 12:36:21 -0700 From: Durham Goode <durham@fb.com> To: <mercurial-devel@selenic.com> X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.12.52, 1.0.27, 0.0.0000 definitions=2014-09-05_06:2014-09-05, 2014-09-05, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=0 kscore.compositescore=1 circleOfTrustscore=615.96 compositescore=0.997382040471249 urlsuspect_oldscore=0.997382040471249 suspectscore=1 recipient_domain_to_sender_totalscore=7379 phishscore=0 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=47479 rbsscore=0.997382040471249 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1409050201 X-FB-Internal: deliver X-BeenThere: mercurial-devel@selenic.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: <mercurial-devel.selenic.com> List-Unsubscribe: <http://selenic.com/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@selenic.com?subject=unsubscribe> List-Archive: <http://selenic.com/pipermail/mercurial-devel> List-Post: <mailto:mercurial-devel@selenic.com> List-Help: <mailto:mercurial-devel-request@selenic.com?subject=help> List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@selenic.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: mercurial-devel-bounces@selenic.com Errors-To: mercurial-devel-bounces@selenic.com |
Comments
Durham Goode - Sept. 5, 2014, 7:36 p.m.
Patch
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -243,6 +243,10 @@ See localrepo.setparents() """ + if self._parentwriters == 0: + raise util.Abort(_("cannot set dirstate parent without " + + " calling dirstate.begingparentchange")) + self._dirty = self._dirtypl = True oldp2 = self._pl[1] self._pl = p1, p2