[Bps-public-commit] Prophet branch, master, updated. 295ab390685b3ae853b0dc582de5c6fcfed089b9

[spang at bestpractical.com]

The branch, master has been updated
       via  295ab390685b3ae853b0dc582de5c6fcfed089b9 (commit)
       via  87e6fadd760024564a3b1c6a55705897231c3ea5 (commit)
      from  bf2f49d39472c06dd4fc679b35ae216a301fbb07 (commit)

Summary of changes:
 lib/Prophet/CLI/Command/Config.pm |    2 +-
 lib/Prophet/CLIContext.pm         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 87e6fadd760024564a3b1c6a55705897231c3ea5
Author: Christine Spang <spang at bestpractical.com>
Date:   Thu Aug 20 21:39:12 2009 +0100

    Don't print scary warnings when using config/alias --user or --global

diff --git a/lib/Prophet/CLI/Command/Config.pm b/lib/Prophet/CLI/Command/Config.pm
index 4c89e0d..60a2692 100644
--- a/lib/Prophet/CLI/Command/Config.pm
+++ b/lib/Prophet/CLI/Command/Config.pm
@@ -127,7 +127,7 @@ sub _warn_unknown_args {
     # help users avoid frustration if they accidentally do something
     # like config add aliases.foo = push --to foo at bar.com
     my %args = %{$self->args};
-    for my $arg ( qw(show edit add delete set) ) {
+    for my $arg ( qw(show edit add delete set user global) ) {
         delete $args{$arg};
     }
     if ( keys %args != 0 ) {

commit 295ab390685b3ae853b0dc582de5c6fcfed089b9
Author: Christine Spang <spang at bestpractical.com>
Date:   Fri Aug 21 00:06:04 2009 +0100

    Check for longer (hex) UUID first in ID regex
    
    As I discovered in my git hook, if you check for the b64 uuid first,
    it's perfectly happy to match on a hex uuid and leave off the last
    10 characters, which is bad if you're trying to, say, capture.

diff --git a/lib/Prophet/CLIContext.pm b/lib/Prophet/CLIContext.pm
index 861e87d..1f3ece7 100644
--- a/lib/Prophet/CLIContext.pm
+++ b/lib/Prophet/CLIContext.pm
@@ -143,7 +143,7 @@ The regex to use for matching the id argument (luid / uuid).
 
 =cut
 
-our $ID_REGEX = qr'(?:\d+|[A-Za-z0-9\-\_]{22}|[0-9a-fA-F\-]{32,36})';
+our $ID_REGEX = qr'(?:\d+|[0-9a-fA-F\-]{32,36}|[A-Za-z0-9\-\_]{22})';
 
 =head2 setup_from_args
 

-----------------------------------------------------------------------