From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 15CCD13877A for ; Mon, 16 Jun 2014 03:37:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E2C6E0BA8; Mon, 16 Jun 2014 03:37:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A851E0BA7 for ; Mon, 16 Jun 2014 03:37:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31FDD33FFDF for ; Mon, 16 Jun 2014 03:37:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id EBE15187EE for ; Mon, 16 Jun 2014 03:37:29 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402792601.10881a57c8b438b4b4e984ebdb375d14fb63d474.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:gsoc2014 commit in: layman/overlays/ X-VCS-Repository: proj/layman X-VCS-Files: layman/overlays/mercurial.py X-VCS-Directories: layman/overlays/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 10881a57c8b438b4b4e984ebdb375d14fb63d474 X-VCS-Branch: gsoc2014 Date: Mon, 16 Jun 2014 03:37:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 159dbc8f-75ca-44bf-87dc-571a96d27826 X-Archives-Hash: d13334353c2510563e91fa11f88cccf6 commit: 10881a57c8b438b4b4e984ebdb375d14fb63d474 Author: Devan Franchini gentoo org> AuthorDate: Wed Jun 11 05:22:51 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Jun 15 00:36:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=10881a57 mercurial.py: Adds module branch support --- layman/overlays/mercurial.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py index 7a5fe08..a1b7846 100644 --- a/layman/overlays/mercurial.py +++ b/layman/overlays/mercurial.py @@ -28,6 +28,8 @@ __version__ = "$Id: mercurial.py 236 2006-09-05 20:39:37Z wrobel $" #------------------------------------------------------------------------------- import re +import xml.etree.ElementTree as ET + from layman.utils import path from layman.overlays.source import OverlaySource, require_supported @@ -48,7 +50,8 @@ class MercurialOverlay(OverlaySource): super(MercurialOverlay, self).__init__(parent, config, _location, ignore) - self.branch = None + self.branch = self.parent.branch + def _fix_mercurial_source(self, source): ''' @@ -77,6 +80,10 @@ class MercurialOverlay(OverlaySource): else: args = ['clone', src, target] + if self.branch: + args.append('-r') + args.append(self.branch) + return self.postsync( self.run_command(self.command(), args, cmd=self.type), cwd=target) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5E4B913877A for ; Mon, 16 Jun 2014 03:40:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22F11E0B8C; Mon, 16 Jun 2014 03:40:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6CCDE0B67 for ; Mon, 16 Jun 2014 03:40:22 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E58D333FDA7 for ; Mon, 16 Jun 2014 03:40:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id CE75F187EE for ; Mon, 16 Jun 2014 03:40:19 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402792601.10881a57c8b438b4b4e984ebdb375d14fb63d474.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/overlays/ X-VCS-Repository: proj/layman X-VCS-Files: layman/overlays/mercurial.py X-VCS-Directories: layman/overlays/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 10881a57c8b438b4b4e984ebdb375d14fb63d474 X-VCS-Branch: master Date: Mon, 16 Jun 2014 03:40:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5a69942c-c89f-4329-a882-b3c8b8a73691 X-Archives-Hash: 2ef0bb89b9dd5e446d7e19daf0745998 Message-ID: <20140616034019.tg8wKsKUdBAOL0fu1NFEU3IZQb8FMT_AXIgdT36RsXY@z> commit: 10881a57c8b438b4b4e984ebdb375d14fb63d474 Author: Devan Franchini gentoo org> AuthorDate: Wed Jun 11 05:22:51 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Jun 15 00:36:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=10881a57 mercurial.py: Adds module branch support --- layman/overlays/mercurial.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py index 7a5fe08..a1b7846 100644 --- a/layman/overlays/mercurial.py +++ b/layman/overlays/mercurial.py @@ -28,6 +28,8 @@ __version__ = "$Id: mercurial.py 236 2006-09-05 20:39:37Z wrobel $" #------------------------------------------------------------------------------- import re +import xml.etree.ElementTree as ET + from layman.utils import path from layman.overlays.source import OverlaySource, require_supported @@ -48,7 +50,8 @@ class MercurialOverlay(OverlaySource): super(MercurialOverlay, self).__init__(parent, config, _location, ignore) - self.branch = None + self.branch = self.parent.branch + def _fix_mercurial_source(self, source): ''' @@ -77,6 +80,10 @@ class MercurialOverlay(OverlaySource): else: args = ['clone', src, target] + if self.branch: + args.append('-r') + args.append(self.branch) + return self.postsync( self.run_command(self.command(), args, cmd=self.type), cwd=target)