repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make git-p4 work with bare repositories.
2007-05-15
Simon Hausmann
Make git-p4 work with
b
are re
p
ositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausman
n
F
i
x git-p4 clone //depot/p
r
oje
c
t (head
im
p
ort)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
M
arius
S
torm-Olsen
M
ake the
c
o
mmand call silent
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Co
n
v
e
rted to unix
newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Mak
e
su
b
mi
t
ting w
o
rk o
n
Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausmann
Make sure all pope
n
c
all
s
use
b
i
n
ary
mode
(for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added a little
.
bat wr
a
pper
f
rom
M
arius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausmann
Use the subproce
s
s module
i
n
ste
a
d of popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon
Hausmann
Doc
u
ment some
im
p
lementation details, for
t
he curiou
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
H
ausmann
Cleanup
,
removed t
h
e old
t
agging c
o
d
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
cle
a
nup, renamed self
.
globalPrefix to
s
elf
.
de
p
otPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
M
icr
o
cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon H
a
usma
n
n
Doc clean
u
ps
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
imon Hausmann
H
an
d
le patch errors i
n
git-p4 submi
t
bet
t
er
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
imon Hau
s
mann
A
new attem
p
t at fixing the ch
i
ld
-
fast-import-proc
e
ss
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hau
s
man
n
Slightly improved formatting
o
f the raw_i
n
p
u
t questions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon Hausma
n
n
Removed
the old patch apply code from git-
p
4 su
b
mit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
imon
H
a
u
smann
Fix the time
z
o
n
e formattin
g
.
Now qg
i
t als
o
d
i
splays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
P
rint an error
me
s
sage of some s
o
rt if git fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
Allow for convenient rebasing af
t
e
r
g
it-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Added a simple
ex
a
mpl
e
o
f usage
t
o
t
h
e "d
o
cumentation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
fix
varia
b
le usag
e
(oops
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
Fix file determ
i
nation for
#
he
a
d
impor
t
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hau
s
mann
Adde
d
git-
p
4
clon
e
convenience command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
mann
Honor --silent for labe
l
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon H
a
usmann
Turn off potentiall
y
slow lab
e
l detecti
o
n b
y
defaul
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hau
s
mann
Provide
a
tree s
u
mmary
after git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Haus
m
a
n
n
A
d
d
ed gi
t
-p4 rebase conveni
e
nce
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon
H
a
usma
n
n
Clean up
python cl
a
ss
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
im
o
n H
a
u
smann
Fix "compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon H
a
usmann
Fix the docs for gi
t
-p4 submit and turn git-p
4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Ha
u
s
m
ann
F
ix variable
usage in tag
import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
on
Hausmann
Added suppo
r
t for
m
ap
p
i
n
g
p4 lab
e
l
s
to git
tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausmann
git-p4 deb
u
g
d
oesn'
t
n
e
ed a git
rep
o
sitor
y
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simo
n
Hausma
n
n
D
on't try to parse
an
y
o
p
tions wit
h
git-p4 debug b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
H
a
usmann
P
re
f
er git
c
ommand over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Haus
m
ann
Minor cosmetic
fixle
t
for t
h
e gi
t
-
p4 submit s
y
nc que
s
tion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
Hausman
n
Diff
e
rent versions of p4 have d
i
fferen
t
output
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
S
imon Hau
s
man
n
U
se t
h
e new incremen
t
al
i
mport s
t
yle b
y
default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
imon Hau
s
m
ann
Make it po
s
sible
to r
u
n git-p4 submit fro
m
within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand new smart incre
m
ent
a
l import that
do
e
sn't ne
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
S
e
t the
default bra
n
ch in ru
n
, no
t
in
the constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n Ha
u
s
mann
Helper func
t
io
n
t
o check the existance of a revi
s
ion
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon
H
ausmann
Added
some hel
p
er function(s)
to parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Chan
g
ed the de
f
ault branch for impor
t
s from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
a
n
n
Changed the
f
o
rmat
o
f the import
e
d log
messag
e
slig
h
tly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Removed the
.
py extensi
o
n from gi
t
-p4 as i
t
's a
n
no
y
in
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Don'
t
show the submit t
e
mplate and the diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausma
n
n
Make it possible to
invoke git-
p
4 fr
o
m
within subdi
r
ectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausmann
Made --apply-
a
s-patch the default for g
i
t-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
o
n Hausmann
Fix support f
o
r deletions in
g
it-p4 su
b
mit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Adde
d
experimental but super-fa
s
t --apply-as-patc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Documentation enh
a
nceme
n
ts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Haus
m
ann
Start of
the git-
p
4 d
o
cumentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Removed p4
-
fa
s
t
-export and p4-git-syn
c
as
t
hey've
b
e
en
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixe
d
the
i
n
i
tial version import b
y
getting the f
i
le
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
u
sma
n
n
Ad
d
ed missing
"self"s to make
t
he script
evaluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Completely
u
ntested
"
m
e
rge
"
of p4-fast-export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync-
t
o-perforce is no
w
called submit
and fixe
d
t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Ha
u
smann
Part of the code is
co
p
yright
b
y Tr
o
lltech A
S
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
First (u
n
tested) att
e
m
p
t at migrating p4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausm
a
nn
Provide
a little bit of help description for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hau
s
mann
Start moving the
g
i
t-p4 tools
i
nto one
single scrip
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imo
n
Hausmann
Pass
t
he r
i
ght numbe
r
of arguments to commi
t
, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausm
a
nn
Im
p
roved the gi
t
d
i
r detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
D
e
fault to i
n
teractive
s
ync
i
ng
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
S
i
mon
H
ausmann
U
s
e p
4
revert
.
.
.
instea
d
of revert -a
.
.
.
after subm
i
tting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n
Hausmann
Auto-detect
t
he
current git branch bef
o
r
e s
u
bmittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Ignore A
p
ple re
s
ource f
i
l
es when importin
g
f
rom perforc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
ausman
n
B
e
nic
e
and u
s
e /usr/bin/env python
f
or the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on
Hausmann
Automatically operate
on a
temporary branc
h
, n
e
eded
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon Hausma
n
n
Lots of bugfixes t
o
p4-
g
it-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon Hausman
n
Fix git-dir option
and allow r
e
ading
l
og subst
i
tuti
o
ns
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
First version of a new scri
p
t to submit ch
a
n
ges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Split up the cache command
l
ine options into (
c
ommand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
usmann
Reduce the
number of false "m
e
rges" by
sk
i
pping "b
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
M
o
re work on
b
ranch detection b
y
implementin
g
chang
e
IsBran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More code
c
le
a
nup
s
and prep
a
rat
i
o
n
s for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Mi
n
or c
o
de cl
e
anups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausm
a
nn
Make the p4 d
a
ta/command cache
c
onfigurable t
h
rough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Fixed
p4-debug fil
e
ex
t
ens
i
on
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon
H
a
u
s
ma
n
n
Changed --known-branches t
o
t
a
ke a fil
e
as
argu
m
ent
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simo
n
Hausmann
Work i
n
progr
e
ss on de
t
ecting
branc
h
es
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausma
n
n
Adjust the output parsing of git name-rev to h
a
ndl
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don'
t
print a pla
i
n newline at
t
he end of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Haus
m
a
n
n
M
o
re w
o
rk in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Added suppor
t
for
--
s
il
e
nt s
o
tha
t
p4-
f
ast
-
export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
S
i
mon H
a
usma
n
n
Added
p4 dele
t
e behavi
o
ural em
u
la
t
ion as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hausman
n
Fix single
-
b
ranch
i
mpor
t
s by s
k
ipping the branch/mer
g
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
imon Hausmann
Us
e
sets
.
Set() instea
d
of set() to ru
n
also wi
t
h ol
d
er
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
Make it po
s
sib
l
e to specify t
h
e
p4 c
h
a
nges t
o
imp
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Haus
m
ann
When trying to map p4 integrations
to g
i
t merges
ju
s
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausman
n
Set git fast
-
import ma
r
ks for every imported ch
a
nge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
imon Hausmann
After marking
a
p4 bra
n
ch as m
e
r
g
e
d don't
ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
Hau
s
m
a
nn
More fixes in heurist
i
c p4 branch
detection based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
im
o
n
Hausmann
Sta
r
ted work on p4 branch detect
i
on
(experimental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Haus
m
ann
Cod
e
cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
C
l
e
a
nups, remove
unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
C
reate
l
ightw
e
igh
t
git ta
g
s (using
the "reset"
t
rick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simo
n
H
a
usmann
A
dded
a little helper script to remov
e
unused ta
g
s
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
next